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

[BUGFIX] Al-Kharid & Shantay Pass banks, fixed waterskins (4) (#418)

Browse Source
This commit is contained in:
Sandro Coutinho
2020-08-10 00:45:16 +01:00
committed by GitHub
parent d9c91bb616
commit 09343c6a8c
8 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/.gitignore
+2 -1
View File
@@ -6,4 +6,5 @@
.classpath
.project
settings.gradle
*.iml
*.iml
server-1.0-jar-with-dependencies.jar
2006Redone Server/data/logs/dropitem/sandro.txt
+9
View File
@@ -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
2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java
+1 -1
View File
@@ -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);
2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java
+8 -1
View File
@@ -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) {
2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java
+2 -1
View File
@@ -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);
2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java
+27 -27
View File
@@ -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);
}
}
}
}
2006Redone Server/src/main/java/com/rebotted/world/Boundary.java
+1 -1
View File
@@ -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
2006Redone file_server/.gitignore
+2 -1
View File
@@ -1,3 +1,4 @@
/bin/
*.iml
/target/
/target/
file_server-1.0-jar-with-dependencies.jar