Merge changes to master --release

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.shynixn"
-version = "9.11.0"
+version = "9.11.1"
 
 repositories {
     mavenCentral()

src/main/java/com/github/shynixn/petblocks/impl/PetEntityImpl.kt

@@ -428,7 +428,17 @@ class PetEntityImpl(
 
         this.petMeta.lastStoredLocation = physicsComponent.position.copy()
         this.velocity = physicsComponent.motion.copy()
-        physicsComponent.tickMinecraft()
+
+        try {
+            physicsComponent.tickMinecraft()
+        } catch (e: Exception) {
+            // Can happen if an invalid world reference exists. e.g. pet references unloaded world
+            this.petMeta.lastStoredLocation = pet.player.location.toVector3d()
+            this.physicsComponent.position = pet.player.location.toVector3d()
+            this.pet.call()
+            return
+        }
+
         playerComponent.tickMinecraft()
         entityComponent.tickMinecraft()
     }

src/main/java/com/github/shynixn/petblocks/impl/listener/PetListener.kt

@@ -64,24 +64,6 @@ class PetListener @Inject constructor(
                     )
                 }
             }
-
-            // Fix references of pet to world which does not exist anymore. e.g. Cross Servers
-            for (pet in pets) {
-                var resetToOwnerPosition = false
-
-                try {
-                    if (pet.location.world == null) {
-                        resetToOwnerPosition = true
-                    }
-                } catch (e: Exception) {
-                    // Exception handling is important here.
-                    resetToOwnerPosition = true
-                }
-
-                if (resetToOwnerPosition) {
-                    pet.location = player.location
-                }
-            }
         }
     }
 

src/main/java/com/github/shynixn/petblocks/impl/provider/PetBlocksPlaceHolderProvider.kt

@@ -179,10 +179,12 @@ class PetBlocksPlaceHolderProvider(
 
                 if (playerPlaceHolderFunctions.containsKey(placeHolderText)) {
                     locatedPlaceHolders[placeHolderText] =
-                        if (pet != null && placeHolderText.contains("PLAYER_OWNER_")) {
+                        if (placeHolderText.contains("_eventPlayer_")) {
+                            playerPlaceHolderFunctions[placeHolderText]!!.invoke(player)
+                        } else if (pet != null) {
                             playerPlaceHolderFunctions[placeHolderText]!!.invoke(pet.player)
                         } else {
-                            playerPlaceHolderFunctions[placeHolderText]!!.invoke(player)
+                            ""
                         }
                 } else if (petPlaceHolderFunctions.containsKey(placeHolderText) && pet != null) {
                     locatedPlaceHolders[placeHolderText] = petPlaceHolderFunctions[placeHolderText]!!.invoke(pet)

src/main/resources/plugin-legacy.yml

@@ -1,5 +1,5 @@
 name: PetBlocks
-version: 9.11.0
+version: 9.11.1
 author: Shynixn
 main: com.github.shynixn.petblocks.PetBlocksPlugin
 softdepend: [ PlaceholderAPI, HeadDatabase]

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: PetBlocks
-version: 9.11.0
+version: 9.11.1
 author: Shynixn
 main: com.github.shynixn.petblocks.PetBlocksPlugin
 softdepend: [ PlaceholderAPI, HeadDatabase]