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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
cc0494817 Tick inactive goal selectors
c19ec6394 fix 4878 by always calling events using bukkit singleton
5d216be1d Fix MC-181190 curing zombie villager discount exploit (#4871)
This commit is contained in:
BillyGalbreath
2020-12-09 19:36:38 -06:00
parent ac346928eb
commit 59439785d9
60 changed files with 77 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0092-Entity-lifespan.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 202ccf2a7f..2fcd7f461a 100644
index 7a40f08646..1d5d87e619 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 202ccf2a7f..2fcd7f461a 100644
public boolean aware = true; // CraftBukkit
protected EntityInsentient(EntityTypes<? extends EntityInsentient> entitytypes, World world) {
@@ -203,6 +203,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -205,6 +205,7 @@ public abstract class EntityInsentient extends EntityLiving {
entityliving = null;
}
}
@@ -25,7 +25,7 @@ index 202ccf2a7f..2fcd7f461a 100644
this.goalTarget = entityliving;
return true;
// CraftBukkit end
@@ -246,10 +247,35 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -248,10 +249,35 @@ public abstract class EntityInsentient extends EntityLiving {
this.m();
this.F();
}
@@ -62,7 +62,7 @@ index 202ccf2a7f..2fcd7f461a 100644
@Override
protected void c(DamageSource damagesource) {
this.m();
@@ -423,6 +449,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -425,6 +451,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
nbttagcompound.setBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -70,7 +70,7 @@ index 202ccf2a7f..2fcd7f461a 100644
}
@Override
@@ -493,6 +520,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -495,6 +522,11 @@ public abstract class EntityInsentient extends EntityLiving {
this.aware = nbttagcompound.getBoolean("Bukkit.Aware");
}
// CraftBukkit end
@@ -82,7 +82,7 @@ index 202ccf2a7f..2fcd7f461a 100644
}
@Override
@@ -1542,7 +1574,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1544,7 +1576,7 @@ public abstract class EntityInsentient extends EntityLiving {
this.a((EntityLiving) this, entity);
this.z(entity);
}