diff --git a/2006Redone Server/.gitignore b/2006Redone Server/.gitignore index 7b6b3df0..bf1944fe 100644 --- a/2006Redone Server/.gitignore +++ b/2006Redone Server/.gitignore @@ -6,4 +6,5 @@ .classpath .project settings.gradle -*.iml \ No newline at end of file +*.iml +server-1.0-jar-with-dependencies.jar \ No newline at end of file diff --git a/2006Redone Server/data/logs/dropitem/sandro.txt b/2006Redone Server/data/logs/dropitem/sandro.txt new file mode 100644 index 00000000..438ba43e --- /dev/null +++ b/2006Redone Server/data/logs/dropitem/sandro.txt @@ -0,0 +1,9 @@ +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3303 absY: 3136 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3303 absY: 3136 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3301 absY: 3138 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3299 absY: 3139 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3297 absY: 3141 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3297 absY: 3141 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3297 absY: 3141 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3297 absY: 3141 +[2020/08/09] 21:08 sandro dropped 1 waterskin(0) absX: 3293 absY: 3147 diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java index 918a3557..629241fd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java @@ -119,7 +119,7 @@ public class DesertHeat { if (waterskin == -1) {//empty waterskin return false; } - if (waterskin > 0) { + if (waterskin >= 0) { player.getItemAssistant().deleteItem(WATERSKINS[waterskin][1], 1); player.getItemAssistant().addItem(WATERSKINS[waterskin][0], 1); player.startAnimation(ANIMATION); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java index 661d0f76..cdcab1d0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java @@ -117,7 +117,14 @@ public class ObjectDefaults { return face = WEST; } case 3194: - return face = (player.objectX == 3381) ? EAST : NORTH; + switch (player.objectX) { + case 3381: + return face = EAST; + case 3309: + return face = WEST; + default: + return face = NORTH; + } case 348: case 349: if (player.objectX == 2971) { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java index 9d640d5a..e38bcfab 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java @@ -114,7 +114,7 @@ public class ObjectsActions { player.getDoubleGates().useDoubleGate(player, objectType); PassDoor.processDoor(player, objectType); AbyssalHandler.handleAbyssalTeleport(player, objectType); - OpenObject.interactObject(player, objectType, objectType == 399); + OpenObject.interactObject(player, objectType); // if its a rock we can mine, mine it if (Mining.rockExists(objectType)) player.getMining().startMining(player, objectType, player.objectX, player.objectY, player.clickObjectType); @@ -2843,6 +2843,7 @@ public class ObjectsActions { Stalls.attemptStall(player, objectType, obX, obY); return; } + OpenObject.interactObject(player, objectType); switch (objectType) { case 6: player.getCannon().pickup(obX, obY); diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java b/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java index 6e2aec51..7d0ba7b5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java @@ -2,40 +2,40 @@ package com.rebotted.game.objects.impl; import com.rebotted.GameEngine; import com.rebotted.game.objects.ObjectDefaults; +import com.rebotted.game.objects.Objects; import com.rebotted.game.players.Player; +import com.rebotted.world.clip.Region; /** * Feb 17, 2018 : 6:44:26 AM * OpenObject.java + * * @author Andrew (Mr Extremez) */ public class OpenObject { - - /** - * Object old - * Object new - */ - private static final int[][] OBJECT_DATA = { - {375, 378}, {6910, 378}, {3193, 3194}, - {2693, 3194}, {388, 389}, {350, 351}, - {348, 349}, {5622, 5623}, {2612, 2613}, - {352, 353}, {398, 399}, {376, 379} - }; - - public static void interactObject(Player player, int objectType, boolean open) { - for (final int[] element : OBJECT_DATA) { - if (!open) { - if (objectType == element[0]) { - GameEngine.objectHandler.createAnObject(element[1], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10); - player.startAnimation(832); - } - } else { - if (objectType == element[1]) { - GameEngine.objectHandler.createAnObject(element[0], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10); - player.startAnimation(832); - } - } - } - } + /** + * Object old + * Object new + */ + private static final int[][] OBJECT_DATA = { + { 375, 378 }, { 6910, 378 }, { 3193, 3194 }, + { 2693, 3194 }, { 388, 389 }, { 350, 351 }, + { 348, 349 }, { 5622, 5623 }, { 2612, 2613 }, + { 352, 353 }, { 398, 399 }, { 376, 379 } + }; + + public static void interactObject(Player player, int objectType) { + for (final int[] element : OBJECT_DATA) { + if (objectType == element[0]) { + GameEngine.objectHandler.placeObject(new Objects(element[1], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10, 0)); + Region.addObject(element[1], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10, false); + player.startAnimation(832); + } else if (objectType == element[1]) { + GameEngine.objectHandler.placeObject(new Objects(element[0], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10, 0)); + Region.addObject(element[0], player.objectX, player.objectY, player.getH(), ObjectDefaults.getObjectFace(player, objectType), 10, false); + player.startAnimation(832); + } + } + } } diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java index c4224180..f34fd922 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java +++ b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java @@ -181,7 +181,7 @@ public class Boundary { public static final Boundary[] BANK_AREA = new Boundary[] { new Boundary(3205, 3212, 3217, 3224, 2), //Lumbridge - new Boundary(3161, 3173, 3269, 3272),//Al Kharid + new Boundary(3264, 3273, 3160, 3174),//Al Kharid new Boundary(2436, 2453, 5174, 5186),//TzHaar new Boundary(2842, 2860, 2950, 2957),//Shilo new Boundary(3456, 3492, 3200, 3215),//Burgh d rott diff --git a/2006Redone file_server/.gitignore b/2006Redone file_server/.gitignore index 02d266be..f030fb16 100644 --- a/2006Redone file_server/.gitignore +++ b/2006Redone file_server/.gitignore @@ -1,3 +1,4 @@ /bin/ *.iml -/target/ \ No newline at end of file +/target/ +file_server-1.0-jar-with-dependencies.jar \ No newline at end of file