Add skeleton bow accuracy option

patches/server/0253-Add-skeleton-bow-accuracy-option.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 2 Sep 2022 13:04:53 -0500
-Subject: [PATCH] Add skeleton bow accuracy option
-
-
-diff --git a/net/minecraft/world/entity/monster/AbstractSkeleton.java b/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 20252b22c88d4cbfe7700052a8c56c9e0d703752..26b64d83b7466863b7340c3292494091e9fb89c1 100644
---- a/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -199,7 +199,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-             }
- 
-             if (event.getProjectile() == entityarrow.getBukkitEntity()) {
--                Projectile.spawnProjectileUsingShoot(entityarrow, worldserver, itemstack1, d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - worldserver.getDifficulty().getId() * 4));
-+                Projectile.spawnProjectileUsingShoot(entityarrow, worldserver, itemstack1, d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, this.level().purpurConfig.skeletonBowAccuracyMap.getOrDefault(this.level().getDifficulty().getId(), (float) (14 - this.level().getDifficulty().getId() * 4))); // Purpur
-             }
-             // CraftBukkit end
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dee8860d593b126353f9f284de65b5fccbe4f530..5be4f4aebec0f2e78633d4849bc7ca032c2aef40 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2609,6 +2609,8 @@ public class PurpurWorldConfig {
-     public boolean skeletonAlwaysDropExp = false;
-     public double skeletonHeadVisibilityPercent = 0.5D;
-     public int skeletonFeedWitherRoses = 0;
-+    public String skeletonBowAccuracy = "14 - difficulty * 4";
-+    public Map<Integer, Float> skeletonBowAccuracyMap = new HashMap<>();
-     private void skeletonSettings() {
-         skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
-         skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2624,6 +2626,18 @@ public class PurpurWorldConfig {
-         skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
-         skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
-         skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
-+        final String defaultSkeletonBowAccuracy = skeletonBowAccuracy;
-+        skeletonBowAccuracy = getString("mobs.skeleton.bow-accuracy", skeletonBowAccuracy);
-+        for (int i = 1; i < 4; i++) {
-+            final float divergence;
-+            try {
-+                divergence = ((Number) Entity.scriptEngine.eval("let difficulty = " + i + "; " + skeletonBowAccuracy)).floatValue();
-+            } catch (javax.script.ScriptException e) {
-+                e.printStackTrace();
-+                break;
-+            }
-+            skeletonBowAccuracyMap.put(i, divergence);
-+        }
-     }
- 
-     public boolean skeletonHorseRidable = false;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch

@@ -12,3 +12,12 @@
                  this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(random.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN));
                  this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
              }
+@@ -217,7 +_,7 @@
+             if (event.getProjectile() == arrow.getBukkitEntity()) {
+             // CraftBukkit end
+             Projectile.spawnProjectileUsingShoot(
+-                arrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, 14 - serverLevel.getDifficulty().getId() * 4
++                arrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, serverLevel.purpurConfig.skeletonBowAccuracyMap.getOrDefault(serverLevel.getDifficulty().getId(), (float) (14 - serverLevel.getDifficulty().getId() * 4))  // Purpur - skeleton bow accuracy option
+             );
+             } // CraftBukkit
+         }

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

@@ -2608,6 +2608,8 @@ public class PurpurWorldConfig {
     public boolean skeletonAlwaysDropExp = false;
     public double skeletonHeadVisibilityPercent = 0.5D;
     public int skeletonFeedWitherRoses = 0;
+    public String skeletonBowAccuracy = "14 - difficulty * 4";
+    public Map<Integer, Float> skeletonBowAccuracyMap = new HashMap<>();
     private void skeletonSettings() {
         skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
         skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2623,6 +2625,18 @@ public class PurpurWorldConfig {
         skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
         skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
         skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
+        final String defaultSkeletonBowAccuracy = skeletonBowAccuracy;
+        skeletonBowAccuracy = getString("mobs.skeleton.bow-accuracy", skeletonBowAccuracy);
+        for (int i = 1; i < 4; i++) {
+            final float divergence;
+            try {
+                divergence = ((Number) Entity.scriptEngine.eval("let difficulty = " + i + "; " + skeletonBowAccuracy)).floatValue();
+            } catch (javax.script.ScriptException e) {
+                e.printStackTrace();
+                break;
+            }
+            skeletonBowAccuracyMap.put(i, divergence);
+        }
     }
 
     public boolean skeletonHorseRidable = false;