Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-21 14:00:11 +01:00
Code Issues Projekte Releases Wiki Aktivität
c025f19c31
Paper/Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch

62 Zeilen
3.5 KiB
Diff
Originalformat Normale Ansicht Verlauf

NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...
2018-07-19 06:42:43 +02:00
From 7d4cc359892f4167574b00e9ae7bb76c528545d6 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 19:34:19 +01:00
From: Sudzzy <originmc@outlook.com>
Paper 1.9
2016-03-01 00:09:49 +01: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 23:27:33 +02: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 19:34:19 +01: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 23:27:33 +02: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 19:34:19 +01: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 23:27:33 +02: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 19:34:19 +01: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 23:27:33 +02: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 19:34:19 +01:00
Paper 1.9
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
index 1ba09df9c..6fc3b7621 100644
Paper 1.9
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
@@ -187,4 +187,9 @@ public class PaperWorldConfig {
Paper 1.9
2016-03-01 00:09:49 +01: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 23:27:33 +02:00
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
index 23562388a..23cab725d 100644
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 23:27:33 +02:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
@@ -798,7 +798,7 @@ public abstract class PlayerList {
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 23:27:33 +02:00
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 19:34:19 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
index 18f68b925..aacf8ea7f 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 19:34:19 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 03:53:17 +02:00
@@ -660,7 +660,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 19:34:19 +01:00
if (fromWorld == toWorld) {
entity.playerConnection.teleport(to);
} else {
- server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
Paper 1.9
2016-03-01 00:09:49 +01: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 19:34:19 +01: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 09:55:24 +02: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 19:34:19 +01:00
In neuem Issue referenzieren Permalink kopieren