Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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:
8ccb7fd67 Add and implement cancellable TargetHitEvent for when Target Blocks are hit by Projectiles
0507b5d7f [Auto] Updated Upstream (CraftBukkit)
1c2571224 [CI-SKIP] [Auto] Rebuild Patches
2b312dfbe Add OBSTRUCTED result to BedEnterResult enum
a5201ac98 [CI-SKIP] [Auto] Rebuild Patches
fb7503399 added PlayerTradeEvent
This commit is contained in:
jmp
2020-12-29 11:49:13 -08:00
parent 77373ea42e
commit 7194a1684a
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0089-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 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68e3946a84 100644
index 1edc13647e0897541e9009e02e1510307e5f3a8f..60797203c0b2c8c3a7caaebe635d8f19d65ed104 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 {
@@ -25,7 +25,7 @@ index 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68
this.goalTarget = entityliving;
return true;
// CraftBukkit end
@@ -248,10 +249,35 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -249,10 +250,35 @@ public abstract class EntityInsentient extends EntityLiving {
this.m();
this.F();
}
@@ -62,7 +62,7 @@ index 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68
@Override
protected void c(DamageSource damagesource) {
this.m();
@@ -425,6 +451,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -426,6 +452,7 @@ public abstract class EntityInsentient extends EntityLiving {
}
nbttagcompound.setBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -70,7 +70,7 @@ index 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68
}
@Override
@@ -495,6 +522,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -496,6 +523,11 @@ public abstract class EntityInsentient extends EntityLiving {
this.aware = nbttagcompound.getBoolean("Bukkit.Aware");
}
// CraftBukkit end
@@ -82,7 +82,7 @@ index 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68
}
@Override
@@ -1542,7 +1574,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1543,7 +1575,7 @@ public abstract class EntityInsentient extends EntityLiving {
this.a((EntityLiving) this, entity);
this.z(entity);
}