Another batch of preemptive bugfixing
This commit is contained in:
+2
-1
@@ -139,7 +139,8 @@ public class Definition<T extends Node> {
|
||||
public String getExamine() {
|
||||
if (examine == null) {
|
||||
try {
|
||||
examine = handlers.get("examine").toString();
|
||||
if(handlers.get("examine") != null)
|
||||
examine = handlers.get("examine").toString();
|
||||
} catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -57,10 +57,8 @@ public final class NPCDefinition extends Definition<NPC> {
|
||||
*/
|
||||
public boolean isVisibleOnMap;
|
||||
|
||||
/* *//**
|
||||
* The examine option value
|
||||
*//*
|
||||
public String examine;*/
|
||||
|
||||
public String examine;
|
||||
|
||||
/**
|
||||
* The drop tables.
|
||||
|
||||
@@ -6,7 +6,6 @@ import core.cache.misc.buffer.ByteBufferUtils;
|
||||
import core.game.interaction.OptionHandler;
|
||||
import core.game.node.entity.player.Player;
|
||||
import core.game.node.object.Scenery;
|
||||
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
|
||||
import rs09.game.system.SystemLogger;
|
||||
import rs09.game.world.GameWorld;
|
||||
|
||||
|
||||
@@ -358,7 +358,7 @@ object RegionManager {
|
||||
val region = forId(regionId)
|
||||
Region.load(region)
|
||||
val `object`: Scenery? = region.planes[z].getChunkObject(x, y, objectId)
|
||||
return if (`object` != null && !`object`.isRenderable()) {
|
||||
return if (`object` != null && !`object`.isRenderable) {
|
||||
null
|
||||
} else `object`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user