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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0110-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d42784775fb1626e 100644
index bbe567dad1212ad3a49503ca9b33c3f28c58a16d..0be1f47b13f617a7aaad4d6334929d9e5f943d3e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -200,7 +200,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1480,6 +1480,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1491,6 +1491,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2235,6 +2236,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2246,6 +2247,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2330,6 +2332,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2341,6 +2343,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
}
return true; // CraftBukkit
}
@@ -2370,6 +2379,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2381,6 +2390,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2535,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2546,6 +2561,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2757,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2768,6 +2784,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public void n(float f) {}
public boolean bL() {
@@ -3191,6 +3208,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3203,6 +3220,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3643,4 +3672,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3655,4 +3684,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 64580ce8dc1d0be61615a47c2fb3a6b0fecc93e6..418744b166571973a02dd6a31f0cc08376980076 100644
index f1e1db97d611192ff2d4b635ef81cf592adde257..81e362c6e0b9e6dde5df3f9009ecc8fdc1943789 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -462,7 +462,7 @@ public abstract class EntityLiving extends Entity {
@@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7a0d93538fbfcc559acc0ac5897aa05b4d39839f..013f281a686adef9a678ace4051c5e51ab677378 100644
index d8cb09e809e382c48071d8abc3d952ca4ef64c9b..beb0a4b91a8abd0374ae40771009832ddf8978f7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -5041,7 +5041,7 @@ index 7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c..bdfdb73bc1305d3fbda2e0ebe8163bf4
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86ddc5346cc2 100644
index d86fa84b48d2c2b3bf4619788bdc64d22212661d..c402803a364908b854efdb5777f355ac5fee51a4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {