2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Some more minor clean up (#215)

Browse Source 
* General clean up

- Reduced woodcutting code by alot, reverted the array to an enum
- Moved the login player method to the packet sender
- Deleted some dead code/cleaned up

* More random cleanup/refractoring

- Moved combat constants to combatconstants.java
- Moved dialogue options to dialogueoptions.java
- Deleted more dead code

* Replaced some poorly written methods

- refreshSkill, levelUp, and getTotalLevel all used way too much code for such a simple function so cleaned it up
- deleted a few other bits of dead code

* Fight caves

- Should fix fight caves npcs nulling out in the middle of your waves if they are too far away
- Also removed some unneeded scynchronization in itemassistant.java

* Gates

- Started cleaning up gate system, still can be improved a lot more
This commit is contained in:
Mr Extremez
2019-11-28 10:47:06 -06:00
committed by Daniel Ginovker
parent 20303071de
commit 68256e41d8
32 changed files with 1668 additions and 2126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/world/ObjectManager.java
+15 -18
View File
@@ -41,55 +41,52 @@ public class ObjectManager {
}, ticks);
}
public static void singleGateTicks(final Player player, final int objectId, final int objectX, final int objectY, final int x1, final int y1, final int objectH, final int face, int ticks) {
public static void singleGateTicks(final Player player, final int objectId, final int newObjectX, final int newObjectY, final int oldObjectX, final int oldObjectY, final int objectH, final int face, int ticks) {
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (DoubleGates.gateAmount == 0) {
if (player.getGateHandler().gateStatus == player.getGateHandler().CLOSED || player.disconnected) {
container.stop();
return;
}
GameEngine.objectHandler.placeObject(new Objects(-1, x1, y1, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(objectId, objectX, objectY, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(-1, oldObjectX, oldObjectY, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(objectId, newObjectX, newObjectY, objectH, face, 0, 0));
container.stop();
}
@Override
public void stop() {
if (DoubleGates.gateAmount == 1) {
DoubleGates.gateAmount = 0;
if (player.getGateHandler().gateStatus == player.getGateHandler().PARTIAL_OPEN) {
player.getGateHandler().gateStatus = player.getGateHandler().CLOSED;
}
}
}, ticks);
}
public static void doubleGateTicks(final Player player, final int objectId, final int objectX, final int objectY,
final int x1, final int y1, final int x2, final int y2,
final int objectH, final int face, int ticks) {
public static void doubleGateTicks(final Player player, final int objectId, final int newObjectX, final int newObjectY, final int oldObjectX, final int oldObjectY, final int oldObjectX2, final int oldObjectY2, final int objectH, final int face, int ticks) {
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (DoubleGates.gateAmount == 0) {
if (player.getGateHandler().gateStatus == player.getGateHandler().CLOSED || player.disconnected) {
container.stop();
return;
}
GameEngine.objectHandler.placeObject(new Objects(-1, x1, y1, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(-1, x2, y2, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(objectId, objectX, objectY, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(-1, oldObjectX, oldObjectY, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(-1, oldObjectX2, oldObjectY2, objectH, face, 0, 0));
GameEngine.objectHandler.placeObject(new Objects(objectId, newObjectX, newObjectY, objectH, face, 0, 0));
container.stop();
}
@Override
public void stop() {
if (DoubleGates.gateAmount == 2) {
DoubleGates.gateAmount = 1;
} else if (DoubleGates.gateAmount == 1) {
DoubleGates.gateAmount = 0;
if (player.getGateHandler().gateStatus == player.getGateHandler().OPEN) {
player.getGateHandler().gateStatus = player.getGateHandler().PARTIAL_OPEN;
} else if (player.getGateHandler().gateStatus == player.getGateHandler().PARTIAL_OPEN) {
player.getGateHandler().gateStatus = player.getGateHandler().CLOSED;
}
}
}, ticks);
}
public boolean objectExists(final int x, final int y) {
for (Object o : objects) {