feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

sign dyes can only be applied when there is some text on the sign

Browse Source
This commit is contained in:
Brokkonaut
2023-06-12 05:55:12 +02:00
parent a6e0e72fb6
commit f743347e66
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
View File

@@ -106,19 +106,19 @@ public class InteractLogging extends LoggingListener {
SignSide signSideBefore = signBefore.getSide(side); SignSide signSideBefore = signBefore.getSide(side);
SignSide signSideAfter = signAfter.getSide(side); SignSide signSideAfter = signAfter.getSide(side);
if (itemType == Material.GLOW_INK_SAC) { if (itemType == Material.GLOW_INK_SAC) {
if (!signSideBefore.isGlowingText()) { if (!signSideBefore.isGlowingText() && hasText(signSideBefore)) {
signSideAfter.setGlowingText(true); signSideAfter.setGlowingText(true);
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter); consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
} }
} else if (itemType == Material.INK_SAC) { } else if (itemType == Material.INK_SAC) {
if (signSideBefore.isGlowingText()) { if (signSideBefore.isGlowingText() && hasText(signSideBefore)) {
signSideAfter.setGlowingText(false); signSideAfter.setGlowingText(false);
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter); consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
} }
} else if (itemType == Material.HONEYCOMB) { } else if (itemType == Material.HONEYCOMB) {
signAfter.setEditable(false); signAfter.setEditable(false);
consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter); consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
} else if (BukkitUtils.isDye(itemType)) { } else if (BukkitUtils.isDye(itemType) && hasText(signSideBefore)) {
DyeColor newColor = BukkitUtils.dyeToDyeColor(itemType); DyeColor newColor = BukkitUtils.dyeToDyeColor(itemType);
if (newColor != null && signSideBefore.getColor() != newColor) { if (newColor != null && signSideBefore.getColor() != newColor) {
signSideAfter.setColor(newColor); signSideAfter.setColor(newColor);
@@ -223,6 +223,15 @@ public class InteractLogging extends LoggingListener {
} }
} }
private boolean hasText(SignSide signSide) {
for (int i = 0; i < 4; i++) {
if (!signSide.getLine(i).isEmpty()) {
return true;
}
}
return false;
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onGenericGameEvent(GenericGameEvent event) { public void onGenericGameEvent(GenericGameEvent event) {
if (lastInteractionPlayer != null && event.getEntity() != null && event.getEntity().getUniqueId().equals(lastInteractionPlayer) && lastInteractionLocation != null && event.getLocation().equals(lastInteractionLocation)) { if (lastInteractionPlayer != null && event.getEntity() != null && event.getEntity().getUniqueId().equals(lastInteractionPlayer) && lastInteractionLocation != null && event.getLocation().equals(lastInteractionLocation)) {