PaperMC/Spigot-Server-Patches/0068-Add-configurable-portal-search-radius.patch

59 lines
2.6 KiB
Diff
Raw Normal View History

2016-05-12 04:07:46 +02:00
From cef04d9da593e1217f0a9c12402bd5deb054c047 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2016-05-12 04:07:46 +02:00
index 246f3d9..0aef69d 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2016-05-12 04:07:46 +02:00
@@ -251,4 +251,9 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
private void allowBlockLocationTabCompletion() {
allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
}
+
+ public int portalSearchRadius;
+ private void portalSearchRadius() {
+ portalSearchRadius = getInt("portal-search-radius", 128);
+ }
}
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
2016-05-12 04:07:46 +02:00
index 6bb68c0..b731b53 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
2016-05-12 04:07:46 +02:00
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
2016-03-07 22:54:14 +01:00
public class PortalTravelAgent {
2016-03-01 00:09:49 +01:00
2016-03-07 22:54:14 +01:00
- private final WorldServer world;
+ protected final WorldServer world; // Paper - private -> protected
private final Random b;
2016-05-12 04:07:46 +02:00
private final Long2ObjectMap<PortalTravelAgent.ChunkCoordinatesPortal> c = new Long2ObjectOpenHashMap(4096);
2016-03-07 22:54:14 +01:00
@@ -92,7 +92,7 @@ public class PortalTravelAgent {
public boolean b(Entity entity, float f) {
// CraftBukkit start - Modularize portal search process and entity teleportation
- BlockPosition found = this.findPortal(entity.locX, entity.locY, entity.locZ, 128);
+ BlockPosition found = this.findPortal(entity.locX, entity.locY, entity.locZ, world.paperConfig.portalSearchRadius); // Paper - Configurable search radius
if (found == null) {
return false;
2016-03-01 00:09:49 +01:00
}
2016-03-07 22:54:14 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
index 1d5dce1..7ca2617 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
@@ -11,7 +11,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent {
public static TravelAgent DEFAULT = null;
2016-03-01 00:09:49 +01:00
2016-03-07 22:54:14 +01:00
- private int searchRadius = 128;
+ private int searchRadius = world.paperConfig.portalSearchRadius; // Paper - Configurable search radius
private int creationRadius = 16;
private boolean canCreatePortal = true;
2016-03-01 00:09:49 +01:00
--
2016-05-12 04:07:46 +02:00
2.8.2
2016-03-01 00:09:49 +01:00