Fix portal removal timing

CitizensDev · Apr 29, 2020 · bbf3f28 · bbf3f28
1 parent a269bf1
commit bbf3f28
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java b/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java
@@ -145,6 +145,7 @@ public void setSkinName(String name, boolean forceUpdate) {
      * Sets the skin data directly, respawning the NPC if spawned
      *
      * @param skinName
+     *            Skin name, for caching purposes
      * @param signature
      *            {@link #getSignature()}
      * @param data

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
@@ -11,6 +11,7 @@
 import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.util.Vector;
@@ -45,6 +46,7 @@
 import net.minecraft.server.v1_15_R1.BlockPosition;
 import net.minecraft.server.v1_15_R1.ChatComponentText;
 import net.minecraft.server.v1_15_R1.DamageSource;
+import net.minecraft.server.v1_15_R1.DimensionManager;
 import net.minecraft.server.v1_15_R1.Entity;
 import net.minecraft.server.v1_15_R1.EntityHuman;
 import net.minecraft.server.v1_15_R1.EntityPlayer;
@@ -77,8 +79,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     private final CitizensNPC npc;
     private final Location packetLocationCache = new Location(null, 0, 0, 0);
     private final SkinPacketTracker skinTracker;
-
     private int updateCounter = 0;
+    private int yawUpdateRequiredTicks;
 
     public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile,
             PlayerInteractManager playerInteractManager, NPC npc) {
@@ -316,7 +318,22 @@ public boolean isNavigating() {
     }
 
     public void livingEntityBaseTick() {
+        // doPortalTick code
+        boolean old = this.af;
+        if (af && ag + 1 > ab()) {
+            af = false;
+            Bukkit.getServer().getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
+                @Override
+                public void run() {
+                    portalCooldown = ba();
+                    a(world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER
+                            ? DimensionManager.OVERWORLD
+                            : DimensionManager.NETHER, TeleportCause.NETHER_PORTAL);
+                }
+            });
+        }
         entityBaseTick();
+        af = old;
         this.az = this.aA;
         if (this.hurtTicks > 0) {
             this.hurtTicks -= 1;
@@ -381,7 +398,7 @@ public void setTargetLook(Entity target, float yawOffset, float renderOffset) {
     }
 
     public void setTargetLook(Location target) {
-        controllerLook.a(target.getX(), target.getY(), target.getZ(), 10, 40);
+        controllerLook.a(target.getX(), target.getY(), target.getZ());
     }
 
     public void setTracked() {
@@ -423,6 +440,16 @@ public void tick() {
         }
 
         npc.update();
+        /*
+        double diff = this.yaw - this.aK;
+        if (diff != 40 && diff != -40) {
+            ++this.yawUpdateRequiredTicks;
+        }
+        if (this.yawUpdateRequiredTicks > 5) {
+            this.yaw = (diff > -40 && diff < 0) || (diff > 0 && diff > 40) ? this.aK - 40 : this.aK + 40;
+            this.yawUpdateRequiredTicks = 0;
+        }
+        */
     }
 
     public void updateAI() {

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java
@@ -34,7 +34,6 @@ public void a() {
             // this.a.yaw = MathHelper.b(this.a.yaw, this.a.aK, 40F);
             // this.a.aK = this.a(this.a.aK, this.a.aI, 10.0F);
         }
-
         if (!this.a.getNavigation().m()) {
             this.a.aK = MathHelper.b(this.a.aK, this.a.aI, 75);
         }