Ensure portal search radius is used when teleporting players (#2877)

Also add the create search radius mojang recently introduced
to config
This commit is contained in:
Spottedleaf
2020-01-18 09:28:32 -08:00
committed by Shane Freeder
parent 701114058c
commit dd8b8df0ca
54 changed files with 278 additions and 261 deletions

View File

@@ -1,11 +1,11 @@
From 013d3a8f08c00a46fea6ded0b2ccaa883310111f Mon Sep 17 00:00:00 2001
From f0e4524e92aa546ee5c57aba4c1940a84faf0ddb Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ab2d8015a..12fa705b0 100644
index 586c9c8ce..de4634486 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index ab2d8015a..12fa705b0 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1459,13 +1459,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1461,13 +1461,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
@@ -65,5 +65,5 @@ index 74a0ceba6..fe26ce3af 100644
{
Set<Player> ret = new HashSet<Player>();
--
2.24.1
2.25.0.windows.1