Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix entities targetting while being ridden

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-02 01:01:03 -06:00
parent 034b14495c
commit 7839152785
15 changed files with 583 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0035-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,4 +1,4 @@
From 251d5327835fdede67ecee55e56f02395deabe36 Mon Sep 17 00:00:00 2001
From 25737109224f0f03d2b5b05312c0a31b3952c424 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 8d57c5f1b5..0a0ecaf197 100644
index 3321e2257..9938e8a5f 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -139,6 +139,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -140,6 +140,7 @@ public class EntityPigZombie extends EntityZombie {
boolean result = super.damageEntity(damagesource, f);
if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
@@ -20,7 +20,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
this.i((EntityLiving) entity);
}
@@ -157,7 +158,7 @@ public class EntityPigZombie extends EntityZombie {
@@ -158,7 +159,7 @@ public class EntityPigZombie extends EntityZombie {
this.angerLevel = event.getNewAnger();
// CraftBukkit end
this.soundDelay = this.random.nextInt(40);
@@ -29,7 +29,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
return true;
}
@@ -204,6 +205,12 @@ public class EntityPigZombie extends EntityZombie {
@@ -205,6 +206,12 @@ public class EntityPigZombie extends EntityZombie {
return this.eA();
}
@@ -43,7 +43,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 64128359c1..f8755060f1 100644
index 64128359c..f8755060f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,11 @@ public class PurpurWorldConfig {