70ce6ce831
This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
From 7b9635a220e06f4be8da1b0f7b446ce506068b1d Mon Sep 17 00:00:00 2001
|
|
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
|
|
index be91b1124..320fd07c6 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -186,4 +186,9 @@ public class PaperWorldConfig {
|
|
private void allChunksAreSlimeChunks() {
|
|
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
|
|
}
|
|
+
|
|
+ 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
|
|
index 576fd6172..524dc7daa 100644
|
|
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
|
|
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
|
|
@@ -70,10 +70,11 @@ public class PortalTravelAgent {
|
|
} else {
|
|
double d2 = Double.MAX_VALUE;
|
|
|
|
- for (int i = -128; i <= 128; ++i) {
|
|
+ int portalSearchRadius = world.paperConfig.portalSearchRadius; // Paper
|
|
+ for (int i = -portalSearchRadius; i <= portalSearchRadius; ++i) { // Paper
|
|
BlockPosition blockposition2;
|
|
|
|
- for (int j = -128; j <= 128; ++j) {
|
|
+ for (int j = -world.paperConfig.portalSearchRadius; j <= world.paperConfig.portalSearchRadius; ++j) { // Paper
|
|
for (BlockPosition blockposition3 = blockposition.b(i, this.world.getHeight() - 1 - blockposition.getY(), j); blockposition3.getY() >= 0; blockposition3 = blockposition2) {
|
|
blockposition2 = blockposition3.down();
|
|
if (this.world.getType(blockposition3).getBlock() == PortalTravelAgent.b) {
|
|
--
|
|
2.21.0
|
|
|