diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java index 1c09647..477c932 100644 --- a/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java @@ -59,7 +59,6 @@ public class RSCConnectionHandler implements IoHandler { if (p.getID() == 55) player.addInterval(); - player.addPacket(p); packets.add(p); } diff --git a/GameServer/src/org/moparscape/msc/gs/model/Player.java b/GameServer/src/org/moparscape/msc/gs/model/Player.java index c4f3cd6..ee9823b 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/Player.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Player.java @@ -20,7 +20,6 @@ import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.builders.MiscPacketBuilder; import org.moparscape.msc.gs.builders.ls.SavePacketBuilder; import org.moparscape.msc.gs.connection.LSPacket; -import org.moparscape.msc.gs.connection.RSCPacket; import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.event.DelayedEvent; import org.moparscape.msc.gs.event.MiniEvent; @@ -45,7 +44,6 @@ import bsh.Interpreter; * A single player. */ public final class Player extends Mob { - // getX() /** * Methods to send packets related to actions @@ -178,8 +176,6 @@ public final class Player extends Mob { */ private boolean firstMajorUpdateSent = false; - private boolean flagCarrier = false; - /** * Event to handle following */ @@ -217,8 +213,6 @@ public final class Player extends Mob { */ private boolean inBank = false; - private boolean infected = false; - /** * Quests */ @@ -227,8 +221,6 @@ public final class Player extends Mob { */ private boolean initialized = false; - private boolean inQuiz = false; - /** * The npc we are currently interacting with */ @@ -266,15 +258,11 @@ public final class Player extends Mob { */ private boolean isTrading = false; - private int killStreak = 0; - /** * List of players this player 'knows' (recieved from the client) about */ private HashMap knownPlayersAppearanceIDs = new HashMap(); - private String lastAnswer = null; - /** * Last arrow fired */ @@ -295,16 +283,10 @@ public final class Player extends Mob { private long lastCommandUsed = GameEngine.getTime(); - /** - * Last packet count time - */ - private long lastCount = 0; - private long lastDeath = GameEngine.getTime(); private int lastdepositedamount = 0; private int lastdepositeditem = 0; - private long lastInfected = GameEngine.getTime(); private long lastInterval = 0; private long lastinvtime = 0; /** @@ -322,12 +304,6 @@ public final class Player extends Mob { private long lastNPCChat = GameEngine.getTime(); private int lastOption = -2; private String[] lastOptions = null; - private long lastPacketRecTime = GameEngine.getTime() / 1000; - /** - * Queue of last 100 packets, used for auto detection purposes - */ - private LinkedList lastPackets = new LinkedList(); - private long lastPacketTime = -1; /** * Last time a 'ping' was received */ @@ -378,7 +354,6 @@ public final class Player extends Mob { * How long is this player muted? */ private long muted = 0; - // Player /** * Added by Konijn */ @@ -408,10 +383,6 @@ public final class Player extends Mob { */ private int owner = 1; - /** - * Amount of packets since last count - */ - private int packetCount = 0; private boolean packetSpam = false; /** * The player's password @@ -437,7 +408,6 @@ public final class Player extends Mob { * This player's quest stage array */ private HashMap questStage = new HashMap(); - private int quizPoints = 0; /** * Ranging event */ @@ -645,30 +615,6 @@ public final class Player extends Mob { } } - /** - * This method acts as a throttle for packets, and adds them to a list.
- * If the player sends more than 20 packets per second they're disconnected - * (60 packets per 3000ms) - * - * @param p - * - the packet to add... - */ - public void addPacket(RSCPacket p) { - long now = GameEngine.getTime(); - if (now - lastCount > 3000) { - lastCount = now; - packetCount = 0; - } - if (!DataConversions.inArray(Formulae.safePacketIDs, p.getID()) - && ++packetCount >= 60) { - destroy(false); - } - if (lastPackets.size() >= 60) { - lastPackets.remove(); - } - lastPackets.addLast(p); - } - public void addPlayersAppearanceIDs(int[] indicies, int[] appearanceIDs) { for (int x = 0; x < indicies.length; x++) { knownPlayersAppearanceIDs.put(indicies[x], appearanceIDs[x]); @@ -945,9 +891,6 @@ public final class Player extends Mob { points += item.getWieldableDef().getArmourPoints(); } } - if (this.isFlagCarrier()) { - points = (int) (points * 0.25); - } return points < 1 ? 1 : points; } @@ -1191,18 +1134,10 @@ public final class Player extends Mob { return ioSession; } - public int getKillStreak() { - return killStreak; - } - public HashMap getKnownPlayersAppearanceIDs() { return knownPlayersAppearanceIDs; } - public String getLastAnswer() { - return lastAnswer; - } - public long getLastArrow() { return lastArrow; } @@ -1219,10 +1154,6 @@ public final class Player extends Mob { return lastCommandUsed; } - public long getLastCount() { - return lastCount; - } - public long getLastDeath() { return lastDeath; } @@ -1259,18 +1190,6 @@ public final class Player extends Mob { return lastOptions; } - public long getLastPacketRecTime() { - return lastPacketRecTime; - } - - public LinkedList getLastPackets() { - return lastPackets; - } - - public long getLastPacketTime() { - return lastPacketTime; - } - public long getLastPing() { return lastPing; } @@ -1379,15 +1298,7 @@ public final class Player extends Mob { public int getOwner() { return owner; } - - public int getPacketCount() { - return packetCount; - } - - public List getPackets() { - return lastPackets; - } - + public String getPassword() { return password; } @@ -1460,10 +1371,6 @@ public final class Player extends Mob { return questStage; } - public int getQuizPoints() { - return quizPoints; - } - public int getRangeEquip() { for (InvItem item : inventory.getItems()) { if (item.isWielded() @@ -1536,7 +1443,7 @@ public final class Player extends Mob { return sleepword; } - public boolean getSpam() { + public boolean isPacketSpam() { return packetSpam; } @@ -1746,19 +1653,6 @@ public final class Player extends Mob { setQuestPoints(getQuestPoints() + amount, true); } - public List infectedBlood() { - List playersInView = viewArea.getPlayersInView(); - List radiusPlayers = new ArrayList(); - for (Player p : playersInView) { - if ((p.getX() - getX() <= 2 || p.getX() - getY() >= -2) - && (p.getY() - getY() <= 2 || p.getY() - getY() >= -2) - && !p.isInfected()) { - radiusPlayers.add(p); - } - } - return radiusPlayers; - } - public void informOfBubble(Bubble b) { bubblesNeedingDisplayed.add(b); } @@ -1845,10 +1739,6 @@ public final class Player extends Mob { return firstMajorUpdateSent; } - public boolean isFlagCarrier() { - return flagCarrier; - } - public boolean isFollowing() { return followEvent != null && following != null; } @@ -1869,18 +1759,10 @@ public final class Player extends Mob { return inBank; } - public boolean isInfected() { - return infected; - } - public boolean isInitialized() { return initialized; } - public boolean isInQuiz() { - return inQuiz; - } - public boolean isInvis() { return invis; } @@ -1933,11 +1815,7 @@ public final class Player extends Mob { public boolean isNoPK() { return nopk; } - - public boolean isPacketSpam() { - return packetSpam; - } - + public boolean isPMod() { return groupID == 5 || isMod() || isAdmin(); } @@ -2109,10 +1987,6 @@ public final class Player extends Mob { return 0; } - public long lastInfected() { - return lastInfected; - } - public void load(String username, String password, int uid, boolean reconnecting) { try { @@ -2667,11 +2541,6 @@ public final class Player extends Mob { this.firstMajorUpdateSent = firstMajorUpdateSent; } - public void setFlagCarrier(boolean flagCarrier) { - this.flagCarrier = flagCarrier; - getActionSender().sendEquipmentStats(); - } - public void setFollowEvent(DelayedEvent followEvent) { this.followEvent = followEvent; } @@ -2737,11 +2606,6 @@ public final class Player extends Mob { this.inBank = inBank; } - public void setInfected() { - infected = true; - getActionSender().sendMessage("You have been afflicted by the plague."); - } - public void setInitialized() { initialized = true; } @@ -2750,10 +2614,6 @@ public final class Player extends Mob { this.initialized = initialized; } - public void setInQuiz(boolean inQuiz) { - this.inQuiz = inQuiz; - } - public void setInteractingNpc(Npc interactingNpc) { this.interactingNpc = interactingNpc; } @@ -2782,19 +2642,11 @@ public final class Player extends Mob { this.ioSession = ioSession; } - public void setKillStreak(int killStreak) { - this.killStreak = killStreak; - } - public void setKnownPlayersAppearanceIDs( HashMap knownPlayersAppearanceIDs) { this.knownPlayersAppearanceIDs = knownPlayersAppearanceIDs; } - public void setLastAnswer(String lastAnswer) { - this.lastAnswer = lastAnswer; - } - public void setLastArrow(long lastArrow) { this.lastArrow = lastArrow; } @@ -2811,10 +2663,6 @@ public final class Player extends Mob { this.lastCommandUsed = lastCommandUsed; } - public void setLastCount(long lastCount) { - this.lastCount = lastCount; - } - public void setLastDeath(long lastDeath) { this.lastDeath = lastDeath; } @@ -2826,10 +2674,6 @@ public final class Player extends Mob { lastdepositedamount = amount; } - public void setLastInfected() { - lastInfected = GameEngine.getTime(); - } - public void setLastInterval(long lastInterval) { this.lastInterval = lastInterval; } @@ -2867,14 +2711,6 @@ public final class Player extends Mob { this.lastOptions = lastOptions; } - public void setLastPacketRecTime(long lastPacketRecTime) { - this.lastPacketRecTime = lastPacketRecTime; - } - - public void setLastPacketTime(long lastPacketTime) { - this.lastPacketTime = lastPacketTime; - } - public void setLastPing(long lastPing) { this.lastPing = lastPing; } @@ -2883,9 +2719,6 @@ public final class Player extends Mob { this.lastPlayerInfo2 = lastPlayerInfo2; } - // Players Online - // sendPlayers - // killedby /** * Sets this player's last quest menu reply */ @@ -3033,10 +2866,6 @@ public final class Player extends Mob { this.owner = owner; } - public void setPacketCount(int packetCount) { - this.packetCount = packetCount; - } - public void setPacketSpam(boolean packetSpam) { this.packetSpam = packetSpam; } @@ -3131,9 +2960,6 @@ public final class Player extends Mob { setQuestStage(quest.getUniqueID(), stage, true); } - public void setQuizPoints(int quizPoints) { - this.quizPoints = quizPoints; - } // 335000 public void setRangeEvent(RangeEvent event) { @@ -3219,7 +3045,7 @@ public final class Player extends Mob { public void setSubscriptionExpires(long expires) { subscriptionExpires = expires; - }// 240000 / drainRate + } public void setSuspicious(boolean suspicious) { this.suspicious = suspicious; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java index 1b05f19..268d1e4 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java @@ -5,7 +5,6 @@ import org.moparscape.msc.config.Config; import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.Server; import org.moparscape.msc.gs.connection.Packet; -import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.event.DelayedEvent; import org.moparscape.msc.gs.event.MiniEvent; import org.moparscape.msc.gs.event.SingleEvent; @@ -29,7 +28,6 @@ public class InvActionHandler implements PacketHandler { public static final World world = Instance.getWorld(); public void handlePacket(Packet p, IoSession session) throws Exception { - int INFECTED_BLOOD = 1322; Player player = (Player) session.getAttachment(); int idx = (int) p.readShort(); if (idx < 0 || idx >= player.getInventory().size()) { @@ -194,38 +192,6 @@ public class InvActionHandler implements PacketHandler { } }); } else if (item.getDef().getCommand().equalsIgnoreCase("open")) { - if (item.getID() == INFECTED_BLOOD) { - if (!player.isInfected()) { - player.setInfected(); - return; - } - long lastUsed = GameEngine.getTime() - player.lastInfected(); - long remaining = 5 - lastUsed / 1000; - InvItem INFECTED_BLOOD_I = new InvItem(1322, 1); - if (lastUsed / 1000 <= 5) { - player.getActionSender().sendMessage( - "You have to wait " + remaining - + " seconds before using that again."); - return; - } - showBubble(player, INFECTED_BLOOD_I); - player.getActionSender().sendMessage( - "Pools of blood spurt our around you."); - for (Player v : player.infectedBlood()) { - if (v == player) - continue; - int bloodChance = DataConversions.random(0, 99); - if (bloodChance >= 15) { - showBubble(v, INFECTED_BLOOD_I); - v.setInfected(); - player.getActionSender().sendMessage( - "You have infected " + v.getUsername() - + " >:D "); - } - } - player.setLastInfected(); - return; - } if (item.getID() == 1321) { int win; int Roll = DataConversions.random(0, 99); diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java index 8d2fe26..3d12590 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java @@ -401,7 +401,7 @@ public class ObjectAction implements PacketHandler { if (object == null) { return; } - if (owner.getSpam()) { + if (owner.isPacketSpam()) { return; } else { owner.setSpam(true); @@ -419,7 +419,7 @@ public class ObjectAction implements PacketHandler { if (object == null) { return; } - if (owner.getSpam()) { + if (owner.isPacketSpam()) { return; } else { owner.setSpam(true); @@ -497,7 +497,7 @@ public class ObjectAction implements PacketHandler { if (object == null) { return; } - if (owner.getSpam()) + if (owner.isPacketSpam()) return; Thieving lock = new Thieving(owner, object); diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java index a8ba2cf..0e39919 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java @@ -42,21 +42,6 @@ public class WalkRequest implements PacketHandler { player.setLastRun(GameEngine.getTime()); player.resetCombat(CombatState.RUNNING); - if (player.isInfected() - && GameEngine.getTime() - player.getLastMoved() < 1900) { - final Packet newpacket = p; - final IoSession newsession = session; - Instance.getDelayedEventHandler().add( - new MiniEvent(player, 2000) { - public void action() { - try { - handlePacket(newpacket, newsession); - } catch (Exception e) { - return; - } - } - }); - } player.isMining(false); if (opponent instanceof Npc) { Npc n = (Npc) opponent; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java index 41b9c6d..c76dae5 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java @@ -116,7 +116,7 @@ public class WallObjectAction implements PacketHandler { "This feature is only avaliable on a members server"); return; } - if (owner.getSpam()) { + if (owner.isPacketSpam()) { return; } Thieving thiev = new Thieving(owner, object); diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java index aa466bc..09e676e 100644 --- a/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java @@ -305,7 +305,7 @@ public class Thieving { Instance.getDelayedEventHandler().add( new WalkToMobEvent(player, affectedMob, 1) { public void arrived() { - if (owner.getSpam()) { + if (owner.isPacketSpam()) { return; } else {