Prevent AI from breaking bed through bed defense

boiscljo · May 23, 2022 · 9c20999 · 9c20999
1 parent 3f673d5
commit 9c20999
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 18 deletions.
diff --git a/plugin/src/main/java/io/github/pronze/sba/utils/citizens/AttackOtherGoal.java b/plugin/src/main/java/io/github/pronze/sba/utils/citizens/AttackOtherGoal.java
@@ -99,7 +99,7 @@ public void doGoal() {
             Player aiPlayer = fakeDeathTrait.getNpcEntity();
             var distance = targetBlock.getLocation().distance(aiPlayer.getLocation());
             if (distance < 3) {
-                fakeDeathTrait.blockPlace().breakBlock(targetBlock);
+                fakeDeathTrait.blockPlace().breakBlock(fakeDeathTrait.blockPlace().viewedBlock(targetBlock));
             }
             else
             {

diff --git a/plugin/src/main/java/io/github/pronze/sba/utils/citizens/BedwarsBlockPlace.java b/plugin/src/main/java/io/github/pronze/sba/utils/citizens/BedwarsBlockPlace.java
@@ -5,6 +5,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
@@ -66,7 +67,6 @@ public boolean placeBlockIfPossible(Location currentLocation) {
         Player aiPlayer = (Player) npc.getEntity();
         ItemStack blockToPlace = getBlock(aiPlayer.getInventory());
 
-
         if (blockToPlace != null) {
 
             var against = getAgainst(block);
@@ -91,26 +91,54 @@ public boolean placeBlockIfPossible(Location currentLocation) {
         return false;
     }
 
+    public Block viewedBlock(Block b) {
+        Player aiPlayer = (Player) getNPC().getEntity();
+        if (aiPlayer == null)
+            return null;
+        World w = aiPlayer.getWorld();
+        var rayTraceCheck = w.rayTraceBlocks(aiPlayer.getEyeLocation(),
+                aiPlayer.getEyeLocation().subtract(b.getLocation()).getDirection(),
+                10);
+
+        return rayTraceCheck.getHitBlock();
+    }
+
     public boolean isBreakableBlock(Block b) {
         if (isBreaking())
             return false;
         Player aiPlayer = (Player) npc.getEntity();
         Game g = Main.getInstance().getGameOfPlayer(aiPlayer);
         if (g == null)
             return false;
-        return g.isBlockAddedDuringGame(b.getLocation());
+        if (!g.isBlockAddedDuringGame(b.getLocation()))
+            return false;
+        return isBlockVisible(b);
+    }
+
+    public boolean isBlockVisible(Block b) {
+        Player aiPlayer = (Player) getNPC().getEntity();
+        if (aiPlayer == null)
+            return false;
+        World w = aiPlayer.getWorld();
+        var rayTraceCheck = w.rayTraceBlocks(aiPlayer.getEyeLocation(),
+                aiPlayer.getEyeLocation().subtract(b.getLocation()).getDirection(),
+                10);
+
+        return rayTraceCheck.getHitBlock().equals(b);
     }
 
     public void breakBlock(Block b) {
-        Player aiPlayer = (Player) npc.getEntity();
-        var destroySpeed = b.getDestroySpeed(aiPlayer.getItemInHand());
+        if (b != null) {
+            Player aiPlayer = (Player) npc.getEntity();
+            var destroySpeed = b.getDestroySpeed(aiPlayer.getItemInHand());
 
-        blockBreakerCooldown = (int) (100 / destroySpeed);
-        blockBreakerTotal = (int) (100 / destroySpeed);
-        blockToBreak = b;
-        startBreak = aiPlayer.getLocation();
+            blockBreakerCooldown = (int) (100 / destroySpeed);
+            blockBreakerTotal = (int) (100 / destroySpeed);
+            blockToBreak = b;
+            startBreak = aiPlayer.getLocation();
 
-        npc.getNavigator().cancelNavigation();
+            npc.getNavigator().cancelNavigation();
+        }
     }
 
     public boolean isBreaking() {
@@ -158,8 +186,7 @@ public boolean isEmpty(Block testBlock) {
     public ItemStack getBlock(Inventory inv) {
 
         ItemStack is = null;
-        if (useStores)
-        {
+        if (useStores) {
             for (var item : inv.getContents()) {
                 if (item != null) {
                     if (item.getType().isBlock())
@@ -171,9 +198,7 @@ public ItemStack getBlock(Inventory inv) {
             if (is == null) {
                 Logger.trace("NPC {} needs blocks", getNPC().getName());
             }
-        }
-        else
-        {
+        } else {
             return new ItemStack(Material.OAK_PLANKS);
         }
         return is;

diff --git a/plugin/src/main/java/io/github/pronze/sba/utils/citizens/BuildBedDefenseGoal.java b/plugin/src/main/java/io/github/pronze/sba/utils/citizens/BuildBedDefenseGoal.java
@@ -61,6 +61,7 @@ public Block findSecondBedBlock(Block b) {
     public boolean isAvailable() {
         if (this.fakeDeathTrait.blockPlace() == null)
             return false;
+        this.fakeDeathTrait.blockPlace().getBlock(this.fakeDeathTrait.getNpcEntity().getInventory());
         if (this.fakeDeathTrait.blockPlace().isInNeedOfBlock())
             return false;
         if (bedBlock == null) {
@@ -109,9 +110,7 @@ public void doGoal() {
                     this.fakeDeathTrait.getNPC().getEntity()
                             .teleport(toPlace.getLocation().toBlockLocation().add(0.5, 1, 0.5));
                 }
-            }
-            else
-            {
+            } else {
                 this.fakeDeathTrait.getNPC().getNavigator().setTarget(toPlace.getLocation());
             }
         }