Fix issues while riding endermen

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From c379803cc6ac0a39a2722e78a47fb7d55011a50b Mon Sep 17 00:00:00 2001
+From fb26e478e18ba7a028d1655ddc8a37a85621e512 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -19,7 +19,7 @@ Subject: [PATCH] Integrate ridables
  .../net/minecraft/server/EntityDolphin.java   |  21 ++-
  .../net/minecraft/server/EntityDrowned.java   |   7 +-
  .../minecraft/server/EntityEnderDragon.java   |   1 +
- .../net/minecraft/server/EntityEnderman.java  |   2 +
+ .../net/minecraft/server/EntityEnderman.java  |  13 +-
  .../net/minecraft/server/EntityEndermite.java |   4 +-
  .../net/minecraft/server/EntityEvoker.java    |   4 +-
  .../java/net/minecraft/server/EntityFish.java |  25 ++--
@@ -86,7 +86,7 @@ Subject: [PATCH] Integrate ridables
  .../pathfinder/PathfinderGoalHasRider.java    |  20 +++
  .../craftbukkit/entity/CraftLivingEntity.java |  10 ++
  .../bukkit/craftbukkit/entity/CraftMob.java   |  12 ++
- 82 files changed, 1422 insertions(+), 131 deletions(-)
+ 82 files changed, 1428 insertions(+), 136 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -799,7 +799,7 @@ index 9acdd6e56..5935ecb52 100644
          this.setHealth(this.getMaxHealth());
          this.noclip = true;
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 8741df83b..560ff3227 100644
+index 8741df83b..188f65ba8 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -23,6 +23,7 @@ public class EntityEnderman extends EntityMonster {
@@ -818,6 +818,59 @@ index 8741df83b..560ff3227 100644
          this.goalSelector.a(1, new EntityEnderman.a(this));
          this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
          this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D, 0.0F));
+@@ -189,7 +191,7 @@ public class EntityEnderman extends EntityMonster {
+             this.damageEntity(DamageSource.DROWN, 1.0F);
+         }
+ 
+-        if (this.world.isDay() && this.ticksLived >= this.bA + 600) {
++        if (getRider() == null && this.world.isDay() && this.ticksLived >= this.bA + 600) { // Purpur
+             float f = this.aI();
+ 
+             if (f > 0.5F && this.world.f(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
+@@ -290,6 +292,7 @@ public class EntityEnderman extends EntityMonster {
+     public boolean damageEntity(DamageSource damagesource, float f) {
+         if (this.isInvulnerable(damagesource)) {
+             return false;
++        } else if (getRider() != null) { return super.damageEntity(damagesource, f); // Purpur
+         } else if (!(damagesource instanceof EntityDamageSourceIndirect) && damagesource != DamageSource.FIREWORKS) {
+             boolean flag = super.damageEntity(damagesource, f);
+ 
+@@ -333,7 +336,7 @@ public class EntityEnderman extends EntityMonster {
+ 
+         @Override
+         public boolean a() {
+-            return this.enderman.getCarried() != null ? false : (!this.enderman.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? false : this.enderman.getRandom().nextInt(20) == 0);
++            return enderman.getRider() == null && this.enderman.getCarried() != null ? false : (!this.enderman.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? false : this.enderman.getRandom().nextInt(20) == 0); // Purpur
+         }
+ 
+         @Override
+@@ -367,8 +370,7 @@ public class EntityEnderman extends EntityMonster {
+ 
+     static class PathfinderGoalEndermanPlaceBlock extends PathfinderGoal {
+ 
+-        private EntityEnderman getEnderman() { return this.a; } // Paper - OBFHELPER
+-        private final EntityEnderman a;
++        private final EntityEnderman a; private EntityEnderman getEnderman() { return this.a; } // Paper - OBFHELPER
+ 
+         public PathfinderGoalEndermanPlaceBlock(EntityEnderman entityenderman) {
+             this.a = entityenderman;
+@@ -376,7 +378,7 @@ public class EntityEnderman extends EntityMonster {
+ 
+         @Override
+         public boolean a() {
+-            return this.a.getCarried() == null ? false : (!this.a.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? false : this.a.getRandom().nextInt(2000) == 0);
++            return getEnderman().getRider() == null && this.a.getCarried() == null ? false : (!this.a.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) ? false : this.a.getRandom().nextInt(2000) == 0); // Purpur
+         }
+ 
+         @Override
+@@ -461,6 +463,7 @@ public class EntityEnderman extends EntityMonster {
+ 
+         @Override
+         public boolean a() {
++            if (getEnderman().getRider() != null) return false; // Purpur
+             this.j = this.i.world.a(this.m, (EntityLiving) this.i);
+             return this.j != null;
+         }
 diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
 index b34695f2d..92288e704 100644
 --- a/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -1865,7 +1918,7 @@ index 140208761..976b3c127 100644
          this.goalSelector.a(2, this.goalSit);
          this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 052a741c0..ccc1ade4e 100644
+index 0668903a3..5cfa69b32 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -15,12 +15,14 @@ public class EntityPhantom extends EntityFlying implements IMonster {

patches/server/0098-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From f57586d123fab52e1a14494b485936afc38994c6 Mon Sep 17 00:00:00 2001
+From 8ad191ed672a2729f636aa6dba1474fdabcfb28f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service