From f62ac6a1ce3903f60599185b8af76b9c0aca6fc2 Mon Sep 17 00:00:00 2001
From: Zeanon <thezeanon@gmail.com>
Date: Sat, 8 May 2021 01:31:30 +0200
Subject: [PATCH] Now it works

---
 .../src/de/steamwar/fightsystem/utils/Region.java           | 6 +++---
 .../de/steamwar/fightsystem/listener/PistonListener.java    | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/FightSystem_API/src/de/steamwar/fightsystem/utils/Region.java b/FightSystem_API/src/de/steamwar/fightsystem/utils/Region.java
index 77a7e55..e31673f 100644
--- a/FightSystem_API/src/de/steamwar/fightsystem/utils/Region.java
+++ b/FightSystem_API/src/de/steamwar/fightsystem/utils/Region.java
@@ -37,7 +37,7 @@ public class Region {
 
     public Region(int minX, int minY, int minZ, int sizeX, int sizeY, int sizeZ, int extendX, int extendZ) {
         this(minX - extendX, minY, minZ - extendZ,
-                sizeX + extendX * 2, sizeY, sizeZ + extendZ * 2);
+             sizeX + extendX * 2, sizeY, sizeZ + extendZ * 2);
     }
 
     public Region(int minX, int minY, int minZ, int sizeX, int sizeY, int sizeZ) {
@@ -96,7 +96,7 @@ public class Region {
 
     public boolean chunkOutside(int cX, int cZ) {
         return getMinChunkX() > cX || cX > getMaxChunkX() ||
-                getMinChunkZ() > cZ || cZ > getMaxChunkZ();
+               getMinChunkZ() > cZ || cZ > getMaxChunkZ();
     }
 
     public void forEachChunk(ObjIntConsumer<Integer> executor) {
@@ -144,7 +144,7 @@ public class Region {
     }
 
     public boolean inRegion(Block block){
-        return in2dRegion(block) && block.getY() >= minY - 1 && block.getY() < maxY;
+        return in2dRegion(block) && minY <= block.getY() && block.getY() < maxY;
     }
 
     public interface TriConsumer<T, V, U>{
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PistonListener.java
index a905508..5be57c1 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PistonListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PistonListener.java
@@ -39,9 +39,8 @@ public class PistonListener implements Listener {
 
     @EventHandler
     public void handlePistonExtend(BlockPistonExtendEvent e){
-        BlockFace b = e.getDirection().getOppositeFace();
         for(Block block : e.getBlocks()){
-            if(!Config.BlueExtendRegion.inRegion(block.getRelative(b)) && !Config.RedExtendRegion.inRegion(block.getRelative(b))){
+            if(!Config.BlueExtendRegion.inRegion(block) && !Config.RedExtendRegion.inRegion(block)){
                 e.setCancelled(true);
                 return;
             }
@@ -50,9 +49,8 @@ public class PistonListener implements Listener {
 
     @EventHandler
     public void handlePistonRetract(BlockPistonRetractEvent e){
-        BlockFace b = e.getDirection().getOppositeFace();
         for(Block block : e.getBlocks()){
-            if(!Config.BlueExtendRegion.inRegion(block.getRelative(b)) && !Config.RedExtendRegion.inRegion(block.getRelative(b))) {
+            if(!Config.BlueExtendRegion.inRegion(block) && !Config.RedExtendRegion.inRegion(block)) {
                 e.setCancelled(true);
                 return;
             }