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

Updated Upstream (Paper)

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

Paper Changes:
0f06d380 Restrict vanilla teleport command to within worldborder
24d93aaf Fix Optional null issue - Fixes #3155
eb71c5fa Fix incorect timing of mspt
1ca80434 Optimise entity hard collision checking
b67a4237 Don't run entity collision code if not needed
bd9aa547 Optimise ArraySetSorted#removeIf
78871d07 Make JavaClassLoader thread-safe (Fixes #3137) (#3144)
This commit is contained in:
ChrystiGalbreath
2020-04-16 20:45:31 -05:00
parent ea1b4e3583
commit 6c4aab0053
21 changed files with 270 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0019-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From e7435b03177cd83fc098e5dd9f0d23dae640fb5f Mon Sep 17 00:00:00 2001
From 005f622f55341fd77c959ae0cd0286f161070ecf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 48be21826c..db6766dce3 100644
index a3bee7bf2..ce9552375 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1047,6 +1047,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1081,6 +1081,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index 48be21826c..db6766dce3 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
@@ -2590,6 +2591,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2624,6 +2625,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -31,7 +31,7 @@ index 48be21826c..db6766dce3 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 723a9fa1ee..f56fd7c012 100644
index 723a9fa1e..f56fd7c01 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,10 +124,10 @@ index 723a9fa1ee..f56fd7c012 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4049ab0273..47b19b7754 100644
index 53925d526..01c0919f6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2812,8 +2812,9 @@ public abstract class EntityLiving extends Entity {
@@ -2818,8 +2818,9 @@ public abstract class EntityLiving extends Entity {
this.aK = f;
}
@@ -140,7 +140,7 @@ index 4049ab0273..47b19b7754 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12fbdf65c5..091f30727f 100644
index 12fbdf65c..091f30727 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,10 +145,12 @@ public class PurpurWorldConfig {
@@ -157,5 +157,5 @@ index 12fbdf65c5..091f30727f 100644
public boolean creeperRidable = false;
--
2.24.0
2.25.0.windows.1