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

A few things (#401)

Browse Source 
- Can't attack players or npcs through doors/walls anymore
- Cleaned up a few small bits of code
- Added a few new boundaries to the boundary system
- Removed dialogue asking are you sure you want to empty your inventory for admins
This commit is contained in:
Mr Extremez
2020-04-10 19:03:28 -05:00
committed by GitHub
parent 43f4b14dbf
commit b4371d3129
19 changed files with 130 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java
+2 -2
View File
@@ -3,7 +3,7 @@ package com.rebotted.game.globalworldobjects;
import com.rebotted.game.objects.Object;
import com.rebotted.game.objects.ObjectDefaults;
import com.rebotted.game.players.Player;
import com.rebotted.world.clip.ObjectDef;
import com.rebotted.world.clip.ObjectDefinition;
import com.rebotted.world.clip.Region;
public class ClimbOther {
@@ -40,7 +40,7 @@ public class ClimbOther {
}
public static void useOther(Player player, int objectType) {
final String objectName = ObjectDef.getObjectDef(objectType).name;
final String objectName = ObjectDefinition.getObjectDef(objectType).name;
if (System.currentTimeMillis() - player.climbDelay < 1800) {
return;
}
2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.rebotted.game.content.music.sound.SoundList;
import com.rebotted.game.objects.Objects;
import com.rebotted.game.players.Player;
import com.rebotted.world.ObjectManager;
import com.rebotted.world.clip.ObjectDef;
import com.rebotted.world.clip.ObjectDefinition;
import com.rebotted.world.clip.Region;
/**
@@ -19,7 +19,7 @@ public class GateHandler {
CLOSED = 0, PARTIAL_OPEN = 1, OPEN = 2;
public boolean isGate(int objectId) {
String objectName = ObjectDef.getObjectDef(objectId).name;
String objectName = ObjectDefinition.getObjectDef(objectId).name;
try {
return objectName.equalsIgnoreCase("gate") || objectName.equalsIgnoreCase("Gate");
} catch (Exception e) {