Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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:
41e6073ce [Auto] Updated Upstream (CraftBukkit)
6f93dc95d Add cause to Weather/ThunderChangeEvents (#4832)
507cf19b3 [CI-SKIP] [Auto] Rebuild Patches
afe0785bf Added PlayerPurchaseEvent for standalone Merchant GUIs (#5583)
615df3d8a Fix entity motion tag from mob spawners (#5718)
2d34898b5 Add methods for getting default item attributes (#5593)
d9766433e Add EntityInsideBlockEvent (#5596)
This commit is contained in:
BillyGalbreath
2021-05-25 04:49:08 -05:00
parent f9ccf6ddbc
commit adb0cafe64
54 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0002-Airplane-Server-Changes.patch
View File

@@ -2011,7 +2011,7 @@ index 33429be7da4d4c2b2469b8140e46e66d9921652c..c0d2b7fe726ea92e18871e3714ca9c24
return this.a(i);
}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 479605b5f8660b6968027a3d7b59075a04e44521..a7e34fc3f648ebc7b9d3f0ea5aae527680f54829 100644
index 6fc215df5ed3aa6ef0c23a57e8444602ff9309e8..1553be4263f08ae21447ccf2e19e8a30a2932208 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -846,6 +846,22 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2263,7 +2263,7 @@ index 92818df3689e35b921eb04678c84d2dd4b21ddbe..f6b723062a9cd0667efcc0171df71e9d
public ItemStack splitStack(int i, int j) {
return i >= this.left.getSize() ? this.right.splitStack(i - this.left.getSize(), j) : this.left.splitStack(i, j);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index feab0ae1930b5271fe0d06a40c180317dcbc9d1d..99c93d48726b4b92a341ba98721173df8b4ff30a 100644
index 6b6abf401cc7c7c79ffb472c35550596fc8e55b5..2a779f1219de2eb1d2ba7d28110bed4824b1d5c5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -289,6 +289,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -2374,7 +2374,7 @@ index bd66ee1b93fc776f77218b87717e0915668e7c04..91eecf296905b85d7cc602dbc3a7b144
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("navigation");
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 96cc46a26eef701b0579f3407e67af9176e1743b..003e1f6dc8efbabcb2e0f7a6b379196f02203903 100644
index 33f689b1c9f4c00969fbdd8ddb21901637afb81c..a49dbcffecc971f797651984cb72c455d40f9331 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -111,6 +111,7 @@ import net.minecraft.world.phys.AxisAlignedBB;