Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -7944,7 +7944,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c4d1b51c2 100644
index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afea6e1d219 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -8328,7 +8328,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
return false;
}
@@ -2842,7 +3074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2844,7 +3076,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.cp().forEach((entity) -> {
worldserver.chunkCheck(entity);
entity.az = true;
@@ -8337,7 +8337,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
while (iterator.hasNext()) {
Entity entity1 = (Entity) iterator.next();
@@ -3300,12 +3532,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3302,12 +3534,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.locBlock;
}
@@ -8354,7 +8354,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
}
public void setMot(double d0, double d1, double d2) {
@@ -3360,7 +3596,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3362,7 +3598,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// Paper end
if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -8397,10 +8397,10 @@ index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..7b32a1fb79dcae355a8d95f3a8aa4284
if (entityhuman != null) {
double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c 100644
index 53d193fab101192ee0e0a5519b78c354122db353..6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2846,7 +2846,11 @@ public abstract class EntityLiving extends Entity {
@@ -2852,7 +2852,11 @@ public abstract class EntityLiving extends Entity {
return;
}
// Paper - end don't run getEntities if we're not going to use its result
@@ -8413,7 +8413,7 @@ index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369e
if (!list.isEmpty()) {
// Paper - move up
@@ -2875,6 +2879,9 @@ public abstract class EntityLiving extends Entity {
@@ -2881,6 +2885,9 @@ public abstract class EntityLiving extends Entity {
this.C(entity);
}
}
@@ -14917,10 +14917,10 @@ index 010f702ea44d2146b0745b2b4d21f948d16cc424..d2ec9f7f105a36a1077ac0df56b1abb4
//Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper End
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4..1fe253bc7261a6077747addf8d9023ca94525999 100644
index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d0b50289c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -503,27 +503,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -508,27 +508,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
entity.setHeadRotation(yaw);
}
@@ -14949,7 +14949,7 @@ index 4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4..1fe253bc7261a6077747addf8d9023ca
@Override
public boolean teleport(Location location) {
@@ -557,6 +537,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -562,6 +542,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return true;
}