Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-30 22:44:24 +01:00
Code Issues Projects Releases Wiki Activity

Fixed redstone trigger behavior

Browse Source
This commit is contained in:
Daniel Saukel 2020-04-14 21:13:26 +02:00
parent a76472a6a0
commit 6cd389c33e
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@
*/ */
package de.erethon.dungeonsxl.trigger; package de.erethon.dungeonsxl.trigger;
import de.erethon.commons.misc.BlockUtil; import de.erethon.dungeonsxl.api.sign.Deactivatable;
import de.erethon.dungeonsxl.api.sign.DungeonSign;
import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent;
import de.erethon.dungeonsxl.world.DGameWorld; import de.erethon.dungeonsxl.world.DGameWorld;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -52,7 +53,21 @@ public class RedstoneTrigger extends Trigger {
} else if (isTriggered()) { } else if (isTriggered()) {
setTriggered(false); setTriggered(false);
updateDSigns();
for (DungeonSign dSign : getDSigns().toArray(new DungeonSign[getDSigns().size()])) {
if (!(dSign instanceof Deactivatable)) {
return;
}
if (dSign.isErroneous()) {
return;
}
for (de.erethon.dungeonsxl.api.Trigger trigger : dSign.getTriggers()) {
if (trigger.isTriggered()) {
return;
}
}
((Deactivatable) dSign).deactivate();
}
} }
} }
@ -63,7 +78,7 @@ 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 = BlockUtil.getAttachedBlock(sign.getBlock()); Block rtBlock = sign.getBlock();
if (rtBlock != null) { if (rtBlock != null) {
for (Trigger uncasted : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) { for (Trigger uncasted : gameWorld.getTriggers(TriggerTypeDefault.REDSTONE)) {
RedstoneTrigger trigger = (RedstoneTrigger) uncasted; RedstoneTrigger trigger = (RedstoneTrigger) uncasted;