Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-02-18 02:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in entity move handler.

Browse Source
This commit is contained in:
bloodshot 2019-12-19 13:25:25 -05:00
parent 1f1a1e655e
commit 3f8156836e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sponge/src/main/java/com/griefdefender/listener/CommonEntityEventHandler.java
View File

@ -110,9 +110,11 @@ public boolean onEntityMove(MoveEntityEvent event, Location<World> fromLocation,
final Entity controller = EntityUtils.getControllingPassenger(targetEntity); final Entity controller = EntityUtils.getControllingPassenger(targetEntity);
if (controller != null && controller instanceof Player) { if (controller != null && controller instanceof Player) {
player = (Player) controller; player = (Player) controller;
} user = PermissionHolderCache.getInstance().getOrCreateUser(player);
} else {
user = PermissionHolderCache.getInstance().getOrCreateUser(targetEntity.getCreator().orElse(null)); user = PermissionHolderCache.getInstance().getOrCreateUser(targetEntity.getCreator().orElse(null));
} }
}
if (user != null) { if (user != null) {
if (user.getInternalPlayerData().teleportDelay > 0) { if (user.getInternalPlayerData().teleportDelay > 0) {
@ -168,7 +170,7 @@ public boolean onEntityMove(MoveEntityEvent event, Location<World> fromLocation,
fromClaim = this.storage.getClaimAt(fromLocation); fromClaim = this.storage.getClaimAt(fromLocation);
} }
if (player != null && GDFlags.ENTER_CLAIM && !enterBlacklisted && user.getInternalPlayerData().lastClaim != null) { if (player != null && GDFlags.ENTER_CLAIM && !enterBlacklisted && user != null && user.getInternalPlayerData().lastClaim != null) {
final GDClaim lastClaim = (GDClaim) user.getInternalPlayerData().lastClaim.get(); final GDClaim lastClaim = (GDClaim) user.getInternalPlayerData().lastClaim.get();
if (lastClaim != null && lastClaim != fromClaim) { if (lastClaim != null && lastClaim != fromClaim) {
if (GDPermissionManager.getInstance().getFinalPermission(event, toLocation, toClaim, GDPermissions.ENTER_CLAIM, targetEntity, targetEntity, player, TrustTypes.ACCESSOR, false) == Tristate.FALSE) { if (GDPermissionManager.getInstance().getFinalPermission(event, toLocation, toClaim, GDPermissions.ENTER_CLAIM, targetEntity, targetEntity, player, TrustTypes.ACCESSOR, false) == Tristate.FALSE) {