craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a null pointer exception if a certain world has no gates.

Browse Source
This commit is contained in:
Tobias Ottenweller
2013-02-23 19:52:41 +01:00
parent 606ea1d5c5
commit e54914bd22
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/de/craftinc/gates/listeners/PluginPortalListener.java
View File

@@ -68,21 +68,23 @@ public class PluginPortalListener implements Listener
Location eventLocation = event.getLocation(); Location eventLocation = event.getLocation();
Gate closestGate = GateUtil.closestGate(eventLocation); Gate closestGate = GateUtil.closestGate(eventLocation);
// Make sure gate and event locations are on the same height (y-value). if (closestGate != null)
// Otherwise the distance will be messed up when players are flying. {
// FIX ME: this could potentially let a nearby nether portal fail! // Make sure gate and event locations are on the same height (y-value).
eventLocation.setY(closestGate.getLocation().getY()); // Otherwise the distance will be messed up when players are flying.
// FIX ME: this could potentially let a nearby nether portal fail!
double distToClosestGate = closestGate.getLocation().distance(eventLocation); eventLocation.setY(closestGate.getLocation().getY());
Plugin.log("closest gate: " + closestGate.getId()); double distToClosestGate = closestGate.getLocation().distance(eventLocation);
Plugin.log("distance: " + distToClosestGate);
Plugin.log("closest gate: " + closestGate.getId());
if (distToClosestGate < 2.0) { Plugin.log("distance: " + distToClosestGate);
this.currentGateAtEvent.put(player, closestGate);
return; if (distToClosestGate < 2.0) {
this.currentGateAtEvent.put(player, closestGate);
return;
}
} }
} }
this.currentGateAtEvent.put(player, null); this.currentGateAtEvent.put(player, null);