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:
0f06d380 Restrict vanilla teleport command to within worldborder
24d93aaf Fix Optional null issue - Fixes #3155
eb71c5fa Fix incorect timing of mspt
1ca80434 Optimise entity hard collision checking
b67a4237 Don't run entity collision code if not needed
bd9aa547 Optimise ArraySetSorted#removeIf
78871d07 Make JavaClassLoader thread-safe (Fixes #3137) (#3144)
This commit is contained in:
ChrystiGalbreath
2020-04-16 20:45:31 -05:00
parent ea1b4e3583
commit 6c4aab0053
21 changed files with 270 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0046-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 866304d7e8ea0c56e8d4c59567255bbc9abd93b6 Mon Sep 17 00:00:00 2001
From 9044e19ed6ab20ef0e977469c2a997fe9c85687c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 09c7c13183..6880cdd7f9 100644
index 09c7c1318..6880cdd7f 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1454c2fa4d..41f4d086e2 100644
index 8a2fcb37f..1aadd8802 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 1454c2fa4d..41f4d086e2 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2231,6 +2231,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2265,6 +2265,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();
@@ -111,7 +111,7 @@ index 1454c2fa4d..41f4d086e2 100644
if (this instanceof EntityPlayer) {
((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index f84dd6d9be..f50e9670bc 100644
index f84dd6d9b..f50e9670b 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b9309f1d2c..d0d3d6c29c 100644
index 0e30dcb87..d8fad3a06 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -75,7 +75,7 @@ public class WorldServer extends World {
@@ -154,5 +154,5 @@ index b9309f1d2c..d0d3d6c29c 100644
private final TickListServer<FluidType> nextTickListFluid;
private final Set<NavigationAbstract> navigators;
--
2.24.0
2.25.0.windows.1