Reapply "nit; only allow any pets to start riding player from server …

…side, do not initiate at all from client" This reverts commit 7dcaff0.
Elite-Modding-Team · Aug 23, 2024 · 6539bf5 · 6539bf5
1 parent 7dcaff0
commit 6539bf5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityPetScorpion.java b/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityPetScorpion.java
@@ -486,10 +486,10 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
             }
         }
 
-        if (this.getRidingEntity() == null && this.getAge() < 60 && !getIsAdult()) {
+        if (!this.world.isRemote && this.getRidingEntity() == null && this.getAge() < 60 && !getIsAdult()) {
             if (this.startRidingPlayer(player)) {
                 this.rotationYaw = player.rotationYaw;
-                if (!this.world.isRemote && !getIsTamed()) {
+                if (!getIsTamed()) {
                     MoCTools.tameWithName(player, this);
                 }
             }

diff --git a/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntitySnake.java b/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntitySnake.java
@@ -175,7 +175,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
             return false;
         }
 
-        if (this.getRidingEntity() == null) {
+        if (!this.world.isRemote && this.getRidingEntity() == null) {
             if (this.startRidingPlayer(player)) {
                 this.rotationYaw = player.rotationYaw;
             }

diff --git a/src/main/java/drzhark/mocreatures/entity/neutral/MoCEntityKitty.java b/src/main/java/drzhark/mocreatures/entity/neutral/MoCEntityKitty.java
@@ -476,7 +476,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
             return MoCTools.tameWithName(player, this);
         }
         if (!stack.isEmpty() && getKittyState() > 2 && pickable() && stack.getItem() == Items.LEAD) {
-            if (this.startRidingPlayer(player)) {
+            if (!this.world.isRemote && this.startRidingPlayer(player)) {
                 changeKittyState(14);
             }
             return true;
@@ -490,7 +490,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
         }
         // Can be picked up, then pick it up
         if (getKittyState() > 2 && pickable()) {
-            if (this.startRidingPlayer(player)) {
+            if (!this.world.isRemote && this.startRidingPlayer(player)) {
                 changeKittyState(15);
             }
             return true;

diff --git a/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityBird.java b/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityBird.java
@@ -324,7 +324,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
         if (!getIsTamed()) {
             return false;
         }
-        if (this.getRidingEntity() == null) {
+        if (!this.world.isRemote && this.getRidingEntity() == null) {
             if (this.startRidingPlayer(player)) {
                 this.rotationYaw = player.rotationYaw;
             }

diff --git a/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityBunny.java b/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityBunny.java
@@ -182,7 +182,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
             MoCTools.playCustomSound(this, MoCSoundEvents.ENTITY_GENERIC_EAT);
             return true;
         }
-        if (this.getRidingEntity() == null && !this.world.isRemote) {
+        if (!this.world.isRemote && this.getRidingEntity() == null) {
             if (this.startRidingPlayer(player)) {
                 this.rotationYaw = player.rotationYaw;
                 if (!getIsTamed()) {
@@ -203,10 +203,6 @@ public void onUpdate() {
         if (this.getRidingEntity() != null) {
             this.rotationYaw = this.getRidingEntity().rotationYaw;
         }
-        if (this.isInsideOfMaterial(Material.WATER) && this.isRiding() && this.getRidingEntity() != null && this.getRidingEntity().isInWater())
-        {
-            MoCTools.dismountPassengerFromEntity(this, this.getRidingEntity(), true);
-        }
         if (!this.world.isRemote) {
             if (--this.jumpTimer <= 0 && this.onGround && ((this.motionX > 0.05D) || (this.motionZ > 0.05D) || (this.motionX < -0.05D) || (this.motionZ < -0.05D))) {
                 this.motionY = 0.3D;

diff --git a/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityMouse.java b/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityMouse.java
@@ -155,7 +155,7 @@ public double getYOffset() {
 
     @Override
     public boolean processInteract(EntityPlayer player, EnumHand hand) {
-        if (this.getRidingEntity() == null) {
+        if (!this.world.isRemote && this.getRidingEntity() == null) {
             if (this.startRidingPlayer(player)) {
                 this.rotationYaw = player.rotationYaw;
             }

diff --git a/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityTurtle.java b/src/main/java/drzhark/mocreatures/entity/passive/MoCEntityTurtle.java
@@ -147,7 +147,7 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) {
                 flipflop(false);
                 return true;
             }
-            if (this.getRidingEntity() == null) {
+            if (!this.world.isRemote && this.getRidingEntity() == null) {
                 if (this.startRidingPlayer(player)) {
                     this.rotationYaw = player.rotationYaw;
                 }