mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
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:
@@ -98,10 +98,10 @@ index 9f4f56c47ecd4b35ebf33ca0bf9a040074ababf2..565c938d879940d8e12fe320ea8524d2
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..fba53ad6792236f0282279283570ffbd6d666f19 100644
|
||||
index fb1d640d89258477dd1286fff929deecffb69d9e..dfedabaeb88b66420db39380fa824cee2d45687b 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -948,6 +948,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -949,6 +949,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
return f;
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..fba53ad6792236f0282279283570ffbd
|
||||
protected void a(DifficultyDamageScaler difficultydamagescaler) {
|
||||
if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
|
||||
int i = this.random.nextInt(2);
|
||||
@@ -1055,6 +1056,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -1056,6 +1057,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user