1.1.2.1 Possible MP fix

direwolf420 · Aug 9, 2021 · df118f3 · df118f3
1 parent fa4e46b
commit df118f3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,8 @@ Credits:
 
 Changelog:
 
+v1.1.2.1: Possibly fix rare bug with mouseovering a pet in multiplayer
+
 v1.1.2: Add a config + setting for disabling the chat autofill feature
 
 v1.1.1.2: Fix rare bug with mouseovering a pet in multiplayer

diff --git a/UI/MouseoverUI/MouseoverUI.cs b/UI/MouseoverUI/MouseoverUI.cs
@@ -16,6 +16,7 @@ internal class MouseoverUI : UIState
 		private string GetPetName()
 		{
 			string ret = string.Empty;
+			Player player;
 			PRPlayer petPlayer;
 			string petName;
 			Rectangle mouse = new Rectangle((int)Main.MouseWorld.X, (int)Main.MouseWorld.Y, 1, 1);
@@ -25,7 +26,13 @@ private string GetPetName()
 				Projectile proj = Main.projectile[k];
 				if (proj.active && proj.owner < Main.maxPlayers)
 				{
-					petPlayer = Main.player[proj.owner].GetModPlayer<PRPlayer>();
+					player = Main.player[proj.owner];
+					if (!player.active)
+					{
+						continue;
+					}
+
+					petPlayer = player.GetModPlayer<PRPlayer>();
 					if (proj.type == petPlayer.petTypeLight)
 					{
 						petName = petPlayer.petNameLight;

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = direwolf420
-version = 1.1.2
+version = 1.1.2.1
 displayName = PetRenamer
 homepage = https://forums.terraria.org/index.php?threads/pet-renamer-allows-you-to-name-your-pets.79293/
 hideCode = true

diff --git a/description.txt b/description.txt
@@ -8,6 +8,8 @@ For instructions on both, visit the homepage
 
 Changelog:
 
+v1.1.2.1: Possibly fix rare bug with mouseovering a pet in multiplayer
+
 v1.1.2: Add a config + setting for disabling the chat autofill feature
 
 v1.1.1.2: Fix rare bug with mouseovering a pet in multiplayer