Fix logic error in allay reset, code cleanup

CitizensDev · Feb 22, 2023 · 8fa5a96 · 8fa5a96
1 parent 5087ffb
commit 8fa5a96
Show file tree

Hide file tree

Showing 1,222 changed files with 1,049 additions and 4,588 deletions.
diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml
@@ -8,14 +8,10 @@
 		<artifactId>citizens-parent</artifactId>
 		<version>2.0.30-SNAPSHOT</version>
 	</parent>
-	<artifactId>citizens-v1_10_R1</artifactId>
-
-	<properties>
+	<artifactId>citizens-v1_10_R1</artifactId>	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.10.2-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<dependencies>
+	</properties>	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>citizens-main</artifactId>
@@ -30,13 +26,9 @@
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
-	</dependencies>
-
-	<build>
+	</dependencies>	<build>
 		<defaultGoal>clean package install</defaultGoal>
-		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-
-		<plugins>
+		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -45,9 +37,7 @@
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
-			</plugin>
-
-            <plugin>
+			</plugin>            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>3.0.0</version>
@@ -63,9 +53,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.2.0</version>
-			</plugin>
-
-			<plugin>
+			</plugin>			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>3.3.0</version>

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Bat;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Blaze;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.CaveSpider;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Chicken;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -66,13 +65,11 @@ public void a(AxisAlignedBB bb) {
 
         @Override
         public void a(boolean flag) {
-            float oldw = width;
-            float oldl = length;
-            super.a(flag);
-            if (oldw != width || oldl != length) {
-                this.setPosition(locX - 0.01, locY, locZ - 0.01);
-                this.setPosition(locX + 0.01, locY, locZ + 0.01);
+            if (npc == null) {
+                super.a(flag);
+                return;
             }
+            NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Cow;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -70,13 +69,11 @@ public void a(AxisAlignedBB bb) {
 
         @Override
         public void a(boolean flag) {
-            float oldw = width;
-            float oldl = length;
-            super.a(flag);
-            if (oldw != width || oldl != length) {
-                this.setPosition(locX - 0.01, locY, locZ - 0.01);
-                this.setPosition(locX + 0.01, locY, locZ + 0.01);
+            if (npc == null) {
+                super.a(flag);
+                return;
             }
+            NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Creeper;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -53,7 +52,6 @@ public NPC getNPC() {
 
     public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder {
         private boolean allowPowered;
-
         private final CitizensNPC npc;
 
         public EntityCreeperNPC(World world) {

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Enderman;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Endermite;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
@@ -4,7 +4,6 @@
 import java.net.Socket;
 import java.util.List;
 import java.util.Map;
-
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -14,10 +13,8 @@
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.util.Vector;
-
 import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
-
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
@@ -78,7 +75,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile,
             PlayerInteractManager playerInteractManager, NPC npc) {
         super(minecraftServer, world, gameProfile, playerInteractManager);
-
         this.npc = (CitizensNPC) npc;
         if (npc != null) {
             skinTracker = new SkinPacketTracker(this);
@@ -259,20 +255,16 @@ private void initialise(MinecraftServer minecraftServer) {
         } catch (IOException e) {
             // swallow
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
-
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
         navigation = new PlayerNavigation(this, world);
         invulnerableTicks = 0;
-        NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
-
-        setSkinFlags((byte) 0xFF);
+        NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing setSkinFlags((byte) 0xFF);
     }
 
     @Override
@@ -309,21 +301,17 @@ public void k_() {
             }
             moveOnCurrentHeading();
         }
-
         updateAI();
-
         if (npc.data().get(NPC.Metadata.COLLIDABLE, !npc.isProtected())) {
             cs();
         }
-
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, !npc.isProtected())) {
             AxisAlignedBB axisalignedbb;
             if (this.isPassenger() && !this.getVehicle().dead) {
                 axisalignedbb = this.getBoundingBox().a(this.getVehicle().getBoundingBox()).grow(1.0, 0.0, 1.0);
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
@@ -339,9 +327,7 @@ public void m() {
             return;
         this.noclip = isSpectator();
         Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity);
-
         updatePackets(npc.getNavigator().isNavigating());
-
         npc.update();
     }
 
@@ -375,7 +361,6 @@ private void moveOnCurrentHeading() {
 
     private void moveWithFallDamage(float mx, float my) {
         double y = this.locY;
-
         g(mx, my);
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftGhast;
 import org.bukkit.entity.Ghast;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftGiant;
 import org.bukkit.entity.Giant;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftGuardian;
 import org.bukkit.entity.Guardian;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
@@ -7,7 +7,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftHorse;
 import org.bukkit.entity.Horse;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
@@ -63,13 +62,11 @@ public void a(AxisAlignedBB bb) {
 
         @Override
         public void a(boolean flag) {
-            float oldw = width;
-            float oldl = length;
-            super.a(flag);
-            if (oldw != width || oldl != length) {
-                this.setPosition(locX - 0.01, locY, locZ - 0.01);
-                this.setPosition(locX + 0.01, locY, locZ + 0.01);
+            if (npc == null) {
+                super.a(flag);
+                return;
             }
+            NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
         @Override

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java
@@ -1,15 +1,12 @@
 package net.citizensnpcs.nms.v1_10_R1.entity;
 
 import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-
 import com.mojang.authlib.GameProfile;
-
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
@@ -31,27 +28,21 @@ protected Entity createEntity(final Location at, final NPC npc) {
         final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle();
         String coloredName = npc.getFullName();
         String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName;
-
         UUID uuid = npc.getUniqueId();
         String teamName = Util.getTeamName(uuid);
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
-
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
-
         Skin skin = handle.getSkinTracker().getSkin();
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
             @Override
             public void run() {
@@ -63,9 +54,7 @@ public void run() {
                 NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
             }
         }, 20);
-
         handle.getBukkitEntity().setSleepingIgnored(true);
-
         return handle.getBukkitEntity();
     }
 

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftIronGolem;
 import org.bukkit.entity.IronGolem;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
@@ -6,7 +6,6 @@
 import org.bukkit.craftbukkit.v1_10_R1.entity.CraftMagmaCube;
 import org.bukkit.entity.MagmaCube;
 import org.bukkit.util.Vector;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
 import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;