mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 10:57:43 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 372dc10f Updated Upstream (CraftBukkit) (#4760) d6fb9717 Updated Upstream (CraftBukkit) Tuinity Changes: 2194b64 Optimizations (starlight, aka leaflight) 1a412ae Fix worldborder crash 957a2ef Fix chunk object leak bcfe550 Re-Add unload poi data patch
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 0822179590..9c781fed14 100644
|
||||
index 870868f0e..1987555a9 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2777,6 +2777,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -2766,6 +2766,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
this.invulnerable = flag;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ index 0822179590..9c781fed14 100644
|
||||
this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
index 42e6761c8b..cfb009c811 100644
|
||||
index 42e6761c8..cfb009c81 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
|
||||
@@ -110,7 +110,7 @@ index 42e6761c8b..cfb009c811 100644
|
||||
public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
|
||||
return (EntityCow) EntityTypes.COW.a((World) worldserver);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 76ff4dd90e..5c79c50acd 100644
|
||||
index 76ff4dd90..5c79c50ac 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -81,7 +81,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -123,7 +123,7 @@ index 76ff4dd90e..5c79c50acd 100644
|
||||
public float aC;
|
||||
public float aD;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b32f4d74a0..d8bd7ffd5f 100644
|
||||
index b32f4d74a..d8bd7ffd5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -132,6 +132,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user