Fix issues with Friendly Villagers

MetallicGoat · Jan 17, 2024 · c5c5ff5 · c5c5ff5
1 parent ad89454
commit c5c5ff5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.metallicgoat</groupId>
     <artifactId>MBedwarsTweaks</artifactId>
-    <version>3.3.2</version>
+    <version>4.0.0</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/MBedwarsTweaksPlugin.java b/src/main/java/me/metallicgoat/tweaksaddon/MBedwarsTweaksPlugin.java
@@ -17,8 +17,8 @@
 
 public class MBedwarsTweaksPlugin extends JavaPlugin {
 
-  public static final int MIN_MBEDWARS_API_VER = 25;
-  public static final String MIN_MBEDWARS_VER_NAME = "5.3.3";
+  public static final int MIN_MBEDWARS_API_VER = 100;
+  public static final String MIN_MBEDWARS_VER_NAME = "5.4";
 
   @Getter
   private static MBedwarsTweaksPlugin instance;

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/cosmetic/FriendlyVillagers.java b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/cosmetic/FriendlyVillagers.java
@@ -170,14 +170,16 @@ private void startLooking() {
 
           if (!visiblePlayers.isEmpty()) {
             // Get the closest player
-            final Player lookAtPlayer = visiblePlayers.stream()
+            final Optional<Player> optionalLookAtPlayer = visiblePlayers.stream()
                 .filter(p -> p.getWorld() == world)
-                .min(Comparator.comparingDouble(p -> p.getLocation().distance(hologramEntity.getLocation())))
-                .get();
+                .min(Comparator.comparingDouble(p -> p.getLocation().distance(hologramEntity.getLocation())));
 
-            // Final location
-            final Location moveTo = hologramEntity.getLocation().setDirection(lookAtPlayer.getLocation().subtract(hologramEntity.getLocation()).toVector());
+            // Rare case, where player has changed worlds or something
+            if (!optionalLookAtPlayer.isPresent())
+              continue;
 
+            final Player lookAtPlayer = optionalLookAtPlayer.get(); // The player to look at
+            final Location moveTo = hologramEntity.getLocation().setDirection(lookAtPlayer.getLocation().subtract(hologramEntity.getLocation()).toVector()); // final location
             final float currentYaw = hologramEntity.getLocation().getYaw(); // where the villager is currently facing
             final float targetYaw = moveTo.getYaw(); // Where we eventually want to end up
             final float difference = targetYaw - currentYaw; // How many degrees the npc needs to turn

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MBedwarsTweaks
-version: 3.3.2
+version: 4.0.0
 author: MetallicGoat
 main: me.metallicgoat.tweaksaddon.MBedwarsTweaksPlugin
 description: Adds some extra customizability to MBedwars