Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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:
1dc7c308 Optimize Collision Chunk lookup and avoid loading far chunks
d5c6dbee Prevent Double PlayerChunkMap adds crashing server
a2a9ffe3 Fix issues with Activation Range causing large chunk lookups.
017297cd Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded()
52cf8906 Remove some old removed 1.14 patches that are never going to be needed (fixed/already applied)
This commit is contained in:
William Blake Galbreath
2020-04-02 02:04:15 -05:00
parent 02ac8a9f37
commit e154b96b66
13 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0033-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From a98890923c56ac158742afa544cc5957a4194fad Mon Sep 17 00:00:00 2001
From 4375fbfecad73783db63b9d11cfafb157bf1108b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1c96e1b02..2d793eb59 100644
index dd48d13e0a..7bba9e9c43 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1287,6 +1287,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1293,6 +1293,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
@@ -23,7 +23,7 @@ index 1c96e1b02..2d793eb59 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 665bbe07f..1f3e5bd28 100644
index 665bbe07fa..1f3e5bd288 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -78,7 +78,7 @@ index 665bbe07f..1f3e5bd28 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index b73e317fb..e1337a9c0 100644
index b73e317fbb..e1337a9c04 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -103,7 +103,7 @@ index b73e317fb..e1337a9c0 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 08cef8e64..086bd505c 100644
index a89c484df0..5406c5066b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,10 +1,16 @@