Only print server-sided foreign pet messages

Elite-Modding-Team · Apr 19, 2024 · ba4f3e1 · ba4f3e1
1 parent 72d7a09
commit ba4f3e1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAmbient.java b/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAmbient.java
@@ -134,11 +134,12 @@ private boolean checkOwnership(EntityPlayer player, EnumHand hand) {
         }
 
         //if the player interacting is not the owner, do nothing!
-        if (MoCreatures.proxy.enableOwnership && this.getOwnerId() != null
-                && !player.getUniqueID().equals(this.getOwnerId())) {
-            ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
-            message.getStyle().setColor(TextFormatting.RED);
-            player.sendMessage(message);
+        if (MoCreatures.proxy.enableOwnership && this.getOwnerId() != null && !player.getUniqueID().equals(this.getOwnerId())) {
+            if (!this.world.isRemote) {
+                ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
+                message.getStyle().setColor(TextFormatting.RED);
+                player.sendMessage(message);
+            }
             return false;
         }
 

diff --git a/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java b/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java
@@ -133,9 +133,11 @@ private boolean checkOwnership(EntityPlayer player, EnumHand hand) {
 
         //if the player interacting is not the owner, do nothing!
         if (MoCreatures.proxy.enableOwnership && this.getOwnerId() != null && !player.getUniqueID().equals(this.getOwnerId())) {
-            ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
-            message.getStyle().setColor(TextFormatting.RED);
-            player.sendMessage(message);
+            if (!this.world.isRemote) {
+                ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
+                message.getStyle().setColor(TextFormatting.RED);
+                player.sendMessage(message);
+            }
             return false;
         }
 

diff --git a/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAquatic.java b/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAquatic.java
@@ -138,11 +138,12 @@ private boolean checkOwnership(EntityPlayer player, EnumHand hand) {
         }
 
         //if the player interacting is not the owner, do nothing!
-        if (MoCreatures.proxy.enableOwnership && this.getOwnerId() != null
-                && !player.getUniqueID().equals(this.getOwnerId())) {
-            ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
-            message.getStyle().setColor(TextFormatting.RED);
-            player.sendMessage(message);
+        if (MoCreatures.proxy.enableOwnership && this.getOwnerId() != null && !player.getUniqueID().equals(this.getOwnerId())) {
+            if (!this.world.isRemote) {
+                ITextComponent message = new TextComponentTranslation("msg.mocreatures.foreignpet");
+                message.getStyle().setColor(TextFormatting.RED);
+                player.sendMessage(message);
+            }
             return false;
         }