Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix global sign creation

This commit is contained in:
Daniel Saukel 2023-09-28 19:12:26 +02:00
parent ce0e1ed4f3
commit 276fca5988
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/de/erethon/dungeonsxl/global/JoinSign.java
View File

@ -19,7 +19,7 @@ package de.erethon.dungeonsxl.global;
import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
import de.erethon.dungeonsxl.util.LWCUtil;
import de.erethon.bedrock.misc.BlockUtil;
import de.erethon.dungeonsxl.util.BlockUtilCompat;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.World;
@ -27,6 +27,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Sign;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.scheduler.BukkitRunnable;
/**
* @author Daniel Saukel
@ -53,7 +54,13 @@ public abstract class JoinSign extends GlobalProtection {
this.startIfElementsAtLeast = startIfElementsAtLeast;
}
update();
// 1.20 doesn't like setting sign text in the same tick as the creation event
new BukkitRunnable() {
@Override
public void run() {
update();
}
}.runTaskLater(plugin, 1L);
}
protected JoinSign(DungeonsXL plugin, World world, int id, ConfigurationSection config) {
@ -148,7 +155,7 @@ public abstract class JoinSign extends GlobalProtection {
Block beneath = block.getLocation().add(0, -1 * i, 0).getBlock();
toAdd.add(beneath);
toAdd.add(BlockUtil.getAttachedBlock(beneath));
toAdd.add(BlockUtilCompat.getAttachedBlock(beneath));
} while (i >= 0);
}

13
core/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java
View File

@ -22,7 +22,7 @@ import de.erethon.dungeonsxl.api.player.PlayerGroup;
import de.erethon.dungeonsxl.config.DMessage;
import de.erethon.dungeonsxl.util.LWCUtil;
import de.erethon.bedrock.chat.MessageUtil;
import de.erethon.bedrock.misc.BlockUtil;
import de.erethon.dungeonsxl.util.BlockUtilCompat;
import java.util.HashSet;
import java.util.Set;
import org.bukkit.ChatColor;
@ -32,6 +32,7 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
/**
* A sign to leave a group.
@ -49,7 +50,13 @@ public class LeaveSign extends GlobalProtection {
super(plugin, sign.getWorld(), id);
this.sign = sign.getBlock();
setText();
// 1.20 doesn't like setting sign text in the same tick as the creation event
new BukkitRunnable() {
@Override
public void run() {
setText();
}
}.runTaskLater(plugin, 1L);
LWCUtil.removeProtection(sign.getBlock());
}
@ -70,7 +77,7 @@ public class LeaveSign extends GlobalProtection {
blocks = new HashSet<>();
blocks.add(sign);
blocks.add(BlockUtil.getAttachedBlock(sign));
blocks.add(BlockUtilCompat.getAttachedBlock(sign));
}
return blocks;