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

Use attached block for r triggers on wall signs; resolves #792

Browse Source
This commit is contained in:
Daniel Saukel 2020-05-10 18:02:52 +02:00
parent 4de94822b2
commit 98f9f2c8de
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/de/erethon/dungeonsxl/trigger/RedstoneTrigger.java
View File

@ -16,6 +16,8 @@
*/ */
package de.erethon.dungeonsxl.trigger; package de.erethon.dungeonsxl.trigger;
import de.erethon.caliburn.category.Category;
import de.erethon.commons.misc.BlockUtil;
import de.erethon.dungeonsxl.api.sign.Deactivatable; import de.erethon.dungeonsxl.api.sign.Deactivatable;
import de.erethon.dungeonsxl.api.sign.DungeonSign; import de.erethon.dungeonsxl.api.sign.DungeonSign;
import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent;
@ -78,8 +80,15 @@ public class RedstoneTrigger extends Trigger {
/* Statics */ /* Statics */
public static RedstoneTrigger getOrCreate(Sign sign, DGameWorld gameWorld) { public static RedstoneTrigger getOrCreate(Sign sign, DGameWorld gameWorld) {
Block rtBlock = sign.getBlock(); Block rtBlock;
if (rtBlock != null) { if (Category.WALL_SIGNS.containsBlock(sign.getBlock())) {
rtBlock = BlockUtil.getAttachedBlock(sign.getBlock());
} else {
rtBlock = sign.getBlock();
}
if (rtBlock == null) {
return null;
}
for (Trigger uncasted : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) { for (Trigger uncasted : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) {
RedstoneTrigger trigger = (RedstoneTrigger) uncasted; RedstoneTrigger trigger = (RedstoneTrigger) uncasted;
if (trigger.rtBlock.equals(rtBlock)) { if (trigger.rtBlock.equals(rtBlock)) {
@ -88,8 +97,6 @@ public class RedstoneTrigger extends Trigger {
} }
return new RedstoneTrigger(rtBlock); return new RedstoneTrigger(rtBlock);
} }
return null;
}
public static void updateAll(DGameWorld gameWorld) { public static void updateAll(DGameWorld gameWorld) {
for (Trigger trigger : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) { for (Trigger trigger : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) {