Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57: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:
826e09f3 Light improvements
e3e1191a Preserve initial velocity of spawned entities - Fixes #4292
bd648dfb Optimize some methods for inlining
9efe0710 Only consider chunks Loaded if at BORDER status
298c9022 Updated Upstream (Bukkit/CraftBukkit/Spigot)
d9467169 [Auto] Updated Upstream (CraftBukkit)
d802a50a Extend block drop capture to capture all items added to the world (Fixes #4307)
This commit is contained in:
William Blake Galbreath
2020-09-20 09:57:51 -05:00
parent 09e0103ee1
commit 9d49a318f7
20 changed files with 302 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0122-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2cff6eb90..6f1537e82 100644
index ade77f6fe..3fd49c7ea 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2374,7 +2374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2390,7 +2390,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ah()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 2cff6eb90..6f1537e82 100644
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -2943,7 +2943,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2963,7 +2963,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {
@@ -27,7 +27,7 @@ index 2cff6eb90..6f1537e82 100644
public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a58f07b4b..ad8ff0587 100644
index a0684f16c..6ca2815b0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,7 @@ public class PurpurWorldConfig {