SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
01334e7d #616: Fix exception on entity portal teleport attempt
This commit is contained in:
Shane Freeder
2020-01-14 21:43:50 +00:00
parent a7b7d83c8c
commit 10159aa459
15 changed files with 33 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/Add-configurable-portal-search-radius.patch
View File

@@ -19,18 +19,18 @@ index 62e793b71..5de4ec052 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2ed5ff412..909f446c6 100644
index 4fcba0c0d..6314c4a19 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// CraftBukkit start - EntityPortalEvent
// SPIGOT-5136 - don't fire event for CraftEntity.teleport
- int searchRadius = 128;
+ int searchRadius = world.paperConfig.portalSearchRadius; // Paper - use portal search radius as default
if (location == null) {
Location enter = this.getBukkitEntity().getLocation();
Location exit = new Location(worldserver1.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ());
blockposition = new BlockPosition(d0, this.locY(), d1);
// CraftBukkit start
- EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, blockposition, 128);
+ EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, blockposition, world.paperConfig.portalSearchRadius); // Paper - use portal search radius
if (event == null) {
return null;
}
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index 503e3016a..b5f224e3b 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java