Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
5dc6bd45 Optimize call to getFluid for explosions (#2859)
0f795c3e Updated Upstream (CraftBukkit)
1d5bd44d Fix entity teleportation exceptions
bd0337b7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
654a1316 Add more chunk debug to watchdog (#2851)
This commit is contained in:
William Blake Galbreath
2020-01-14 19:46:20 -06:00
parent 6a70fc621d
commit e4b55a3da2
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0098-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 8eddd9ec26a8ff2a6a8d0fc889d487807b9005bc Mon Sep 17 00:00:00 2001
From 66fd07748dbfff18e75f6026006e521c93cd13f5 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
@@ -86,7 +86,7 @@ index 2dc3ab4cfa..1c0df77c2b 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 5e99ad8144..42590e2977 100644
index b502e589d4..e5a64e07da 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -171,9 +171,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -111,7 +111,7 @@ index 5e99ad8144..42590e2977 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 25b694e7df..601af0efe4 100644
index b5f224e3b4..32b9ad3d81 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 {
@@ -122,7 +122,7 @@ index 25b694e7df..601af0efe4 100644
public PortalTravelAgent(WorldServer worldserver) {
this.world = worldserver;
@@ -211,7 +212,7 @@ public class PortalTravelAgent {
@@ -233,7 +234,7 @@ public class PortalTravelAgent {
boolean flag1 = l2 < 0;
blockposition_mutableblockposition.d(j3, l3, i4);
@@ -131,7 +131,7 @@ index 25b694e7df..601af0efe4 100644
}
}
}
@@ -221,7 +222,7 @@ public class PortalTravelAgent {
@@ -243,7 +244,7 @@ public class PortalTravelAgent {
for (i3 = -1; i3 < 4; ++i3) {
if (k2 == -1 || k2 == 2 || i3 == -1 || i3 == 3) {
blockposition_mutableblockposition.d(i5 + k2 * k5, j5 + i3, j2 + k2 * l5);
@@ -141,7 +141,7 @@ index 25b694e7df..601af0efe4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 58d67168e8..f2f3ebd970 100644
index 53763216f0..ba8f62d112 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -65,7 +65,7 @@ public class WorldServer extends World {