geforkt von Mirrors/Paper
f37381ea8a
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.
28 Zeilen
1.4 KiB
Diff
28 Zeilen
1.4 KiB
Diff
From ee64b1f98b2e1a48027cfd90612cdd63cf415db7 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Thu, 16 Apr 2020 20:07:29 -0500
|
|
Subject: [PATCH] Restrict vanilla teleport command to valid locations
|
|
|
|
Fixes GH-3165
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java
|
|
index 3060b4f68b1..79016b58707 100644
|
|
--- a/src/main/java/net/minecraft/server/CommandTeleport.java
|
|
+++ b/src/main/java/net/minecraft/server/CommandTeleport.java
|
|
@@ -116,6 +116,12 @@ public class CommandTeleport {
|
|
}
|
|
|
|
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) {
|
|
+ // 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);
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
if (entity instanceof EntityPlayer) {
|
|
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2));
|
|
|
|
--
|
|
2.26.2
|
|
|