Skip to content

Commit

Permalink
Lag fixed :) (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
dginovker authored Nov 11, 2019
1 parent 2aef86e commit 2f26fbe
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 26 deletions.
1 change: 1 addition & 0 deletions 2006Redone Server/data/logs/dropitem/spamtest1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[2019/11/10] 22:30 spamtest1 dropped 1 grimy lantadyme absX: 3231 absY: 3207
2 changes: 2 additions & 0 deletions 2006Redone Server/data/logs/pickupitem/spamtest1.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions 2006Redone Server/src/redone/game/objects/ObjectsActions.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ public void firstClickObject(int objectType, int objectX, int objectY) {
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;
Expand Down
36 changes: 16 additions & 20 deletions 2006Redone Server/src/redone/world/ObjectHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import redone.Server;
Expand Down Expand Up @@ -139,33 +140,28 @@ public void placeObject(Objects o) {
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);
}
}
}
}
}

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() {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f26fbe

Please sign in to comment.