SteamWar/BauSystem
SteamWar/BauSystem
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

Merge pull request 'Fixed Detonator CCE' (#97) from detonator2.0 into master

Quellcode durchsuchen 
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2020-09-15 10:23:56 +02:00
Commit f0169f0b59
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
BauSystem_Main/src/de/steamwar/bausystem/world/Detonator.java
Datei anzeigen

@ -79,7 +79,7 @@ public class Detonator implements Listener {
for (Detoloader.DetonatorActivation activation: getLocations()) { for (Detoloader.DetonatorActivation activation: getLocations()) {
Boolean powered; Boolean powered;
if(activation.activation == -1) switch (Core.getVersion()) { if(activation.activation == 0) switch (Core.getVersion()) {
case 15: case 15:
powered = AutoLoader_15.getLever(activation.location.getBlock()); powered = AutoLoader_15.getLever(activation.location.getBlock());
AutoLoader_15.setRedstone(activation.location, !powered); AutoLoader_15.setRedstone(activation.location, !powered);
@ -120,7 +120,7 @@ public class Detonator implements Listener {
detoloader = AutoLoader_12.onPlayerInteractLoader(event); detoloader = AutoLoader_12.onPlayerInteractLoader(event);
} }
if(detoloader == null) return; if(detoloader == null || detoloader.activation == -1) return;
if(event.getPlayer().isSneaking()) { if(event.getPlayer().isSneaking()) {
if(locs.stream().filter(detonatorActivation -> detonatorActivation.location.equals(event.getClickedBlock().getLocation())).collect(Collectors.toList()).size() == 1) { if(locs.stream().filter(detonatorActivation -> detonatorActivation.location.equals(event.getClickedBlock().getLocation())).collect(Collectors.toList()).size() == 1) {