core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0480-Restrict-vanilla-telep...

28 lines
1.4 KiB
Diff
Raw Normal View History

Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity.
2020-05-06 09:22:03 +00:00
From ee64b1f98b2e1a48027cfd90612cdd63cf415db7 Mon Sep 17 00:00:00 2001
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
From: Zach Brown <zach@zachbr.io>
Date: Thu, 16 Apr 2020 20:07:29 -0500
Be less strict with vanilla teleport command limits Just limit to the same valid location check as BaseBlockPosition, no reason to restrict to the world border. Ref: GH-3165
2020-04-17 02:16:35 +00:00
Subject: [PATCH] Restrict vanilla teleport command to valid locations
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
Be less strict with vanilla teleport command limits Just limit to the same valid location check as BaseBlockPosition, no reason to restrict to the world border. Ref: GH-3165
2020-04-17 02:16:35 +00:00
Fixes GH-3165
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java
Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity.
2020-05-06 09:22:03 +00:00
index 3060b4f68b1..79016b58707 100644
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
--- a/src/main/java/net/minecraft/server/CommandTeleport.java
+++ b/src/main/java/net/minecraft/server/CommandTeleport.java
Be less strict with vanilla teleport command limits Just limit to the same valid location check as BaseBlockPosition, no reason to restrict to the world border. Ref: GH-3165
2020-04-17 02:16:35 +00:00
@@ -116,6 +116,12 @@ public class CommandTeleport {
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
}
private static void a(CommandListenerWrapper commandlistenerwrapper, Entity entity, WorldServer worldserver, double d0, double d1, double d2, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, float f, float f1, @Nullable CommandTeleport.a commandteleport_a) {
Be less strict with vanilla teleport command limits Just limit to the same valid location check as BaseBlockPosition, no reason to restrict to the world border. Ref: GH-3165
2020-04-17 02:16:35 +00:00
+ // Paper start - Don't allow teleport command to invalid locations
+ if (d0 <= -30000000 || d2 <= -30000000 || d0 > 30000000 || d2 > 30000000) { // Copy/pasta from BaseBlockPosition#isValidLocation
+ org.bukkit.Bukkit.getLogger().warning("Refused to teleport " + entity.getName() + " to " + d0 + ", " + d1 + ", " + d2);
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00
+ return;
+ }
+ // Paper end
if (entity instanceof EntityPlayer) {
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2));
--
Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity.
2020-05-06 09:22:03 +00:00
2.26.2
Restrict vanilla teleport command to within worldborder Fixes GH-3165
2020-04-17 01:11:44 +00:00