core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0062-Configurable-inter-wor...

62 lines
3.5 KiB
Diff
Raw Normal View History

Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
From a1057f8d4cd02724b07e348e56022b1892e0cb40 Mon Sep 17 00:00:00 2001
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
From: Sudzzy <originmc@outlook.com>
Paper 1.9
2016-02-29 23:09:49 +00:00
Date: Thu, 3 Mar 2016 02:50:31 -0600
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
Subject: [PATCH] Configurable inter-world teleportation safety
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation
safety check.
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest
or door block. While they are in this block, they accept a teleport request from a player within a different world. Once
the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a
player's skybase.
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
The wanted destination was on top of the emerald block however the player ended on top of the diamond block.
This only is the case if the player is teleporting between worlds.
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
Paper 1.9
2016-02-29 23:09:49 +00:00
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
index 38ccabc0d..b241c0380 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Added options to disable additional ore generation in Mesa and Extreme Hills (#1006)
2018-02-13 00:44:50 +00:00
@@ -237,4 +237,9 @@ public class PaperWorldConfig {
Paper 1.9
2016-02-29 23:09:49 +00:00
private void portalSearchRadius() {
portalSearchRadius = getInt("portal-search-radius", 128);
}
+
+ public boolean disableTeleportationSuffocationCheck;
+ private void disableTeleportationSuffocationCheck() {
+ disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
+ }
}
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 536534d2e..bf7aaebd6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -799,7 +799,7 @@ public abstract class PlayerList {
exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity);
entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
- this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, true); // SPIGOT-3864
+ this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, !exitWorld.paperConfig.disableTeleportationSuffocationCheck); // SPIGOT-3864 // Paper GH-1149 - Tie suffocation check to config option
if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) {
entityplayer.getBukkitEntity().setVelocity(velocity);
}
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Tie PlayerList#moveToWorld safety to existing config Also renames patch file to better express what it's doing. It is presumed that those using this config option intend for suffocation checks to be disabled in all instances. In doing so, they inherently assume the advantages and issues associated with removing said safety check. If the community expresses a desire for more specific options regarding the handling of this safety feature, we can investigate providing them. Fixes GH-1149
2018-06-18 21:27:33 +00:00
index c14100ac6..6a43f5674 100644
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Update B/CB
2018-02-12 18:04:05 +00:00
@@ -614,7 +614,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
if (fromWorld == toWorld) {
entity.playerConnection.teleport(to);
} else {
- server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
Paper 1.9
2016-02-29 23:09:49 +00:00
+ // Paper - Configurable suffocation check
+ server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, !toWorld.paperConfig.disableTeleportationSuffocationCheck);
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00
}
return true;
}
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.0
Fix inter-world teleportation glitches People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation safety check. To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest or door block. While they are in this block, they accept a teleport request from a player within a different world. Once the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a player's skybase. Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
2016-02-28 18:34:19 +00:00