Upstream
/
GriefDefender
mirror of https://github.com/bloodmc/GriefDefender.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix player-deny-flight not resetting on teleport.

This commit is contained in:
bloodshot 2020-11-13 17:37:52 -05:00
parent ffcc534e35
commit 720c37b5dd
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
View File

@ -932,6 +932,8 @@ public class PlayerEventHandler implements Listener {
return;
}
GDCauseStackManager.getInstance().pushCause(player);
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
playerData.optionNoFly = null; // Reset no fly option on teleports as from/to claim would be the same
if (!GDFlags.ENTITY_TELEPORT_FROM && !GDFlags.ENTITY_TELEPORT_TO) {
return;
}
@ -954,7 +956,6 @@ public class PlayerEventHandler implements Listener {
if (type == TeleportCause.UNKNOWN && !sourceLocation.getWorld().getUID().equals(destination.getWorld().getUID())) {
source = destination.getWorld().getEnvironment().name().toLowerCase().replace("the_", "") + "_portal";
}
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
final GDClaim sourceClaim = this.dataStore.getClaimAtPlayer(playerData, player.getLocation());
if (playerData.inPvpCombat() && GDOptions.isOptionEnabled(Options.PVP_COMBAT_TELEPORT)) {
// Cancel event if player is unable to teleport during PvP combat

16
sponge/src/main/java/com/griefdefender/listener/EntityEventHandler.java
View File

@ -708,13 +708,17 @@ public class EntityEventHandler {
GDTimings.ENTITY_TELEPORT_EVENT.startTimingIfSync();
Player player = null;
GDClaim sourceClaim = null;
GDPlayerData playerData = null;
GDPermissionUser user = null;
if (entity instanceof Player) {
player = (Player) entity;
user = PermissionHolderCache.getInstance().getOrCreateUser(player);
final GDPlayerData playerData = user.getInternalPlayerData();
playerData = user.getInternalPlayerData();
playerData.optionNoFly = null; // Reset no fly option on teleports as from/to claim would be the same
sourceClaim = this.dataStore.getClaimAtPlayer(playerData, player.getLocation());
// Cancel event if player is unable to teleport during PvP combat
final boolean pvpCombatTeleport = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Boolean.class), player, Options.PVP_COMBAT_TELEPORT);
final boolean pvpCombatTeleport = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Boolean.class), player, Options.PVP_COMBAT_TELEPORT, sourceClaim);
if (!pvpCombatTeleport && GDOptions.isOptionEnabled(Options.PVP_COMBAT_TELEPORT)) {
final int combatTimeRemaining = playerData.getPvpCombatTimeRemaining();
if (combatTimeRemaining > 0) {
@ -731,6 +735,7 @@ public class EntityEventHandler {
user = PermissionHolderCache.getInstance().getOrCreateUser(entity.getCreator().orElse(null));
if (user != null && user.getOnlinePlayer() != null) {
player = user.getOnlinePlayer();
playerData = user.getInternalPlayerData();
}
}
@ -752,12 +757,7 @@ public class EntityEventHandler {
return;
}
GDClaim sourceClaim = null;
GDPlayerData playerData = null;
if (player != null) {
playerData = GriefDefenderPlugin.getInstance().dataStore.getOrCreatePlayerData(player.getWorld(), player.getUniqueId());
sourceClaim = this.dataStore.getClaimAtPlayer(playerData, player.getLocation());
} else {
if (sourceClaim == null) {
sourceClaim = this.dataStore.getClaimAt(sourceLocation);
}