Adding chunk tickets to ending TP location

CoolLord22 · Sep 6, 2023 · c8bdad2 · c8bdad2
1 parent 03d8dea
commit c8bdad2
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/com/coollord22/otheranimalteleport/OATMethods.java b/src/main/java/com/coollord22/otheranimalteleport/OATMethods.java
@@ -15,8 +15,11 @@ public class OATMethods {
 	public static void teleportLeashedEnt(Entity ent, Location from, Location to, Player p, OtherAnimalTeleport plugin) {
 		String entID = "[Ent-" + ent.getEntityId() + "] ";
 		Chunk fromChunk = from.getChunk();
-		if(plugin.toUseTickets) 
+		Chunk toChunk = to.getChunk();
+		if(plugin.toUseTickets) {
 			fromChunk.addPluginChunkTicket(plugin);
+			toChunk.addPluginChunkTicket(plugin);
+		}
 
 		plugin.log.logInfo(entID + "Attempting to null the leash holder.", Verbosity.HIGHEST);
 		((LivingEntity) ent).setLeashHolder(null);
@@ -36,8 +39,10 @@ public void run() {
 				plugin.log.logInfo(entID + "Re-attaching leash holder as " + p.getName() + ".", Verbosity.HIGHEST);
 				((LivingEntity) ent).setLeashHolder(p);
 
-				if(plugin.toUseTickets) 
+				if(plugin.toUseTickets) {
 					fromChunk.removePluginChunkTicket(plugin);
+					toChunk.removePluginChunkTicket(plugin);
+				}
 
 				undoInvulnerable(ent, invulnerable, plugin);
 			}
@@ -47,8 +52,11 @@ public void run() {
 	public static void teleportEnt(Entity ent, Location from, Location to, Player p, OtherAnimalTeleport plugin) {
 		String entID = "[Ent-" + ent.getEntityId() + "] ";
 		Chunk fromChunk = from.getChunk();
-		if(plugin.toUseTickets) 
+		Chunk toChunk = to.getChunk();
+		if(plugin.toUseTickets) {
 			fromChunk.addPluginChunkTicket(plugin);
+			toChunk.addPluginChunkTicket(plugin);
+		}
 
 		boolean invulnerable = ent.isInvulnerable();
 
@@ -62,8 +70,10 @@ public void run() {
 				plugin.log.logInfo(entID + "Teleporting entity" + ent.getType(), Verbosity.HIGH);
 				ent.teleport(to);
 
-				if(plugin.toUseTickets)
+				if(plugin.toUseTickets) {
 					fromChunk.removePluginChunkTicket(plugin);
+					toChunk.removePluginChunkTicket(plugin);
+				}
 
 				undoInvulnerable(ent, invulnerable, plugin);
 			}