mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper & Airplane)
Upstream has released updates that appear to apply and compile correctly Paper Changes: 47d48790d Change return type of ItemStack#editMeta to allow checking for successful vs non-successful edits 7aabe7d56 [CI-SKIP] fix minecart vs minecraft typos (#5713) f775e87b4 [CI-SKIP] ci: update setup-java action (#5710) c58b3b277 ci: replace Java 11 with Java 16 in GH Actions build flow (#5709) 4b72327a6 ItemStack#editMeta 68984b664 Add Unix domain socket support (#5611) 68c67e680 Add Mob#lookAt API (#5633) 4bacecd16 [Auto] Updated Upstream (Bukkit/CraftBukkit) 1f28e6eeb Fix default ChatRenderer when no plugins are installed (#5702) ecb0d32ca Enhance (Async)ChatEvent with per-viewer rendering API (#5684) Airplane Changes: 636dbff0f [ci skip] Cleanup mcdev import files c57932048 [ci skip] Remove icons 7ada9a476 [skip ci] Need to specify 1.16.5 in the README of course 813df1a44 Update README daf3f0b29 Optimize air case for raytracing
This commit is contained in:
@@ -322,7 +322,7 @@ index 4e084e26e0430422b0348a0a91f0e412ff3a9eff..2fed41af0416174a6e23282e3931f0b7
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
index e10377b379079bc467a60abe719075c5ef73e858..a5e3809d60a78d4638c81a2279ce15e6a66fd336 100644
|
||||
index 698997425a7f5a7a5d46fa5d825ec26f61e6c7c4..dd1f4c4202e30a837b48b591327b018a35a0edff 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
|
||||
@@ -46,8 +46,6 @@ import net.minecraft.world.entity.ai.sensing.EntitySenses;
|
||||
@@ -387,7 +387,7 @@ index e10377b379079bc467a60abe719075c5ef73e858..a5e3809d60a78d4638c81a2279ce15e6
|
||||
public void v(float f) {
|
||||
this.aR = f;
|
||||
}
|
||||
@@ -1332,7 +1333,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -1335,7 +1336,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
protected void a(EntityHuman entityhuman, EntityInsentient entityinsentient) {}
|
||||
|
||||
protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
|
||||
@@ -396,7 +396,7 @@ index e10377b379079bc467a60abe719075c5ef73e858..a5e3809d60a78d4638c81a2279ce15e6
|
||||
}
|
||||
|
||||
public boolean ev() {
|
||||
@@ -1713,4 +1714,54 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -1716,4 +1717,54 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
this.unleash(true, event.isDropLeash());
|
||||
// Paper end
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user