mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-05 16:49:06 +00:00
Random stuff 3 (#304)
* Make ::update automatically restart server as well
* Add bank area checks back since previously you could open a bank, and as long as you didn't open another interface you could abuse it
* Fix noclip (NEEDS TESTING)
* Revert "Fix noclip (#302)"
This reverts commit 521ae52e4c.
* ::clip command removed, fixed a typo, reordered some stuff, fixed a bug with others cannon
-Removed the clip command from the client;
-Fixed a typo in a dialogue;
-Fixed mud battlestaff nto working as runes (water and earth);
-Fixed a bug with other cannons near you preventing you from setting down a cannon. Somehow your player would glitch himself and make it impossible to spawn a cannon at certain spot;
Co-authored-by: Daniel Ginovker <dcress01@uoguelph.ca>
This commit is contained in:
@@ -86,6 +86,7 @@ public class DwarfCannon {
|
||||
if (setUpStage >= 4) {
|
||||
container.stop();
|
||||
setUpStage = 0;
|
||||
player.CannonSetupStage = setUpStage;
|
||||
settingUp = false;
|
||||
return;
|
||||
}
|
||||
@@ -102,6 +103,7 @@ public class DwarfCannon {
|
||||
placeObject(OBJECT_PARTS[setUpStage], player.absX, player.absY, true);
|
||||
player.getItemAssistant().deleteItem(ITEM_PARTS[setUpStage], 1);
|
||||
setUpStage ++;
|
||||
player.CannonSetupStage = setUpStage;
|
||||
}
|
||||
@Override
|
||||
public void stop() {
|
||||
@@ -148,7 +150,7 @@ public class DwarfCannon {
|
||||
}
|
||||
|
||||
public boolean hasCannon() {
|
||||
return (player.cannonX > 0) && (player.cannonY > 0) || (player.cannonX > 0 && player.cannonY > 0);
|
||||
return (player.CannonSetupStage != 0 || (player.cannonX > 0 && player.cannonY > 0));
|
||||
}
|
||||
|
||||
private boolean myCannon(int x, int y) {
|
||||
@@ -313,7 +315,7 @@ public class DwarfCannon {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void pickup(int x, int y) {
|
||||
if (!myCannon(x, y)) {
|
||||
player.getPacketSender().sendMessage("You can't pick up somebody else's cannon!");
|
||||
@@ -343,13 +345,13 @@ public class DwarfCannon {
|
||||
player.cannonX = 0;
|
||||
player.cannonY = 0;
|
||||
}
|
||||
|
||||
|
||||
public void placeObject(int id, int x, int y, boolean add) {
|
||||
GameEngine.objectHandler.placeObject(new Objects(id, x, y, 0, 516, 10, 0));
|
||||
if (add)
|
||||
Region.addObject(id, x, y, 0, 10, 516, true);
|
||||
}
|
||||
|
||||
|
||||
public void removeObject(int x, int y) {
|
||||
placeObject(-1, x, y, false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user