Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-09 20:31:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix incompatibility with plugins that change sign blocks onSignChange; resolves #423

Browse Source
This commit is contained in:
Daniel Saukel 2018-06-17 00:21:26 +02:00
parent 2da4e74261
commit 024f004153
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionListener.java
View File

@ -26,6 +26,7 @@ import de.erethon.dungeonsxl.world.DEditWorld;
import java.util.List;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -228,6 +229,11 @@ public class GlobalProtectionListener implements Listener {
public void onSignChange(SignChangeEvent event) {
Player player = event.getPlayer();
Block block = event.getBlock();
BlockState state = block.getState();
if (!(state instanceof Sign)) {
return;
}
String[] lines = event.getLines();
// Group Signs
@ -251,12 +257,8 @@ public class GlobalProtectionListener implements Listener {
}
} else if (lines[1].equalsIgnoreCase(LeaveSign.LEAVE_SIGN_TAG)) {
if (block.getState() instanceof Sign) {
Sign sign = (Sign) block.getState();
new LeaveSign(plugin.getGlobalProtections().generateId(LeaveSign.class, sign.getWorld()), sign);
}
Sign sign = (Sign) state;
new LeaveSign(plugin.getGlobalProtections().generateId(LeaveSign.class, sign.getWorld()), sign);
event.setCancelled(true);
}
}

8
src/main/java/de/erethon/dungeonsxl/sign/DSignListener.java
View File

@ -25,6 +25,7 @@ import de.erethon.dungeonsxl.world.DEditWorld;
import de.erethon.dungeonsxl.world.DGameWorld;
import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -79,7 +80,12 @@ public class DSignListener implements Listener {
String[] lines = event.getLines();
Player player = event.getPlayer();
Block block = event.getBlock();
Sign sign = (Sign) block.getState();
BlockState state = block.getState();
if (!(state instanceof Sign)) {
return;
}
Sign sign = (Sign) state;
DEditWorld editWorld = DEditWorld.getByWorld(sign.getWorld());
if (editWorld == null) {
return;