diff --git a/2006Redone Server/data/logs/dropitem/spamtest1.txt b/2006Redone Server/data/logs/dropitem/spamtest1.txt new file mode 100644 index 00000000..8ef0fb53 --- /dev/null +++ b/2006Redone Server/data/logs/dropitem/spamtest1.txt @@ -0,0 +1 @@ +[2019/11/10] 22:30 spamtest1 dropped 1 grimy lantadyme absX: 3231 absY: 3207 diff --git a/2006Redone Server/data/logs/pickupitem/spamtest1.txt b/2006Redone Server/data/logs/pickupitem/spamtest1.txt new file mode 100644 index 00000000..c33ff630 --- /dev/null +++ b/2006Redone Server/data/logs/pickupitem/spamtest1.txt @@ -0,0 +1,2 @@ +[2019/11/10] 22:46 spamtest1 picked up bones itemX: 3231, itemY: 3236 +[2019/11/10] 22:46 spamtest1 picked up bones itemX: 3231, itemY: 3236 diff --git a/2006Redone Server/src/redone/game/objects/ObjectsActions.java b/2006Redone Server/src/redone/game/objects/ObjectsActions.java index cacbd23c..e1d896cf 100644 --- a/2006Redone Server/src/redone/game/objects/ObjectsActions.java +++ b/2006Redone Server/src/redone/game/objects/ObjectsActions.java @@ -65,11 +65,6 @@ public class ObjectsActions { player.getActionSender().sendMessage("This object does not exist. Please report this to a staff member."); return; } - if (player.isBotting == true) { - player.getActionSender().sendMessage("You can't click any objects until you confirm you are not botting."); - player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting."); - return; - } if (Webs.webs(player, objectType)) { Webs.slashWeb(player, objectType, objectX, objectY); return; diff --git a/2006Redone Server/src/redone/world/ObjectHandler.java b/2006Redone Server/src/redone/world/ObjectHandler.java index 51195e47..c85e95a5 100644 --- a/2006Redone Server/src/redone/world/ObjectHandler.java +++ b/2006Redone Server/src/redone/world/ObjectHandler.java @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import redone.Server; @@ -139,19 +140,17 @@ public class ObjectHandler { for (Player p : PlayerHandler.players) { if (p != null) { Client person = (Client) p; - if (person != null) { - if (person.heightLevel == o.getObjectHeight() - && o.objectTicks == 0) { - if (person.distanceToPoint(o.getObjectX(), - o.getObjectY()) <= 60) { - removeAllObjects(o); - globalObjects.add(o); - person.getActionSender().object( - o.getObjectId(), o.getObjectX(), - o.getObjectY(), o.getObjectFace(), - o.getObjectType()); - //Region.addObject(o.getObjectId(), o.getObjectX(), o.getObjectY(), o.getObjectHeight(), o.getObjectType(), o.getObjectFace(), true); - } + if (person.heightLevel == o.getObjectHeight() + && o.objectTicks == 0) { + if (person.distanceToPoint(o.getObjectX(), + o.getObjectY()) <= 60) { + removeAllObjects(o); + globalObjects.add(o); + person.getActionSender().object( + o.getObjectId(), o.getObjectX(), + o.getObjectY(), o.getObjectFace(), + o.getObjectType()); + //Region.addObject(o.getObjectId(), o.getObjectX(), o.getObjectY(), o.getObjectHeight(), o.getObjectType(), o.getObjectFace(), true); } } } @@ -159,13 +158,10 @@ public class ObjectHandler { } public void removeAllObjects(Objects o) { - for (Objects s : globalObjects) { - if (o.getObjectX() == o.objectX && o.getObjectY() == o.objectY - && s.getObjectHeight() == o.getObjectHeight()) { - globalObjects.remove(s); - break; - } - } + //Using Iterator for concurrency + globalObjects.removeIf(s -> s.getObjectX() == o.getObjectX() && + s.getObjectY() == o.getObjectY() && + s.getObjectHeight() == o.getObjectHeight()); } public void process() { diff --git a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar index c46e1927..0d073e14 100644 Binary files a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar and b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar differ diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class index b47e9729..fd5d43a8 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/npcs/NpcAggressive.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class index 036ca92a..87c17475 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$1.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$1.class index b23c9538..039baa8f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$1.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$2.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$2.class index 7fe62f35..51c43f06 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$2.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$3.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$3.class index acecfe95..9f84cece 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$3.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$4.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$4.class index 55f8a0a6..4be3876e 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$4.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$5.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$5.class index fd4dcd31..8c221eea 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$5.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions$5.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class index 71cf6309..2bd86f98 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class and b/CompiledServer/production/2006rebotted/redone/game/objects/ObjectsActions.class differ diff --git a/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class b/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class index 0f4f67f3..9a41e70d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class and b/CompiledServer/production/2006rebotted/redone/world/ObjectHandler.class differ diff --git a/README.md b/README.md index 1984a678..bb5caf6a 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Step 17: Start the Client [Image](https://i.imgur.com/dHTiU0I.png) # Using Parabot with your local server: -- **1:** Download the latest `localhost_2006rebotted.jar` from [here](https://github.com/dginovker/2006rebotted/releases) +- **1:** Download the latest `localhost_2006rebotted.jar` from [here](https://github.com/dginovker/2006rebotted/releases) (or, if testing server changes, compile it yourself like [this](https://i.imgur.com/uDrF0gl.png)) - **2:** Download the latest `Provider-version.jar` file from [here](http://v3.bdn.parabot.org/api/bot/download/default-provider?nightly=false) - **3:** Create a file called `localhost.json` in `{user}\Documents\Parabot\servers` - **4:** Put the following in the file