41 lines
2.3 KiB
Diff
41 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Mon, 30 Apr 2018 17:15:26 -0400
|
||
|
|
Subject: [PATCH] Block Enderpearl Travel Exploit
|
||
|
|
|
||
|
|
Players are able to use alt accounts and enderpearls to travel
|
||
|
|
long distances utilizing the pearls in unloaded chunks and loading
|
||
|
|
the chunk later when convenient.
|
||
|
|
|
||
|
|
This disables that by not saving the thrower when the chunk is unloaded.
|
||
|
|
|
||
|
|
This is mainly useful for survival servers that do not allow freeform teleporting.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index cebf1a623a9bec72d60fdd23dda01868ef6431d4..e8e1e7dafaf1c105b2f58cf3e118e3d665dc50ec 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -363,4 +363,10 @@ public class PaperWorldConfig {
|
||
|
|
private void disableSprintInterruptionOnAttack() {
|
||
|
|
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean disableEnderpearlExploit = true;
|
||
|
|
+ private void disableEnderpearlExploit() {
|
||
|
|
+ disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
|
||
|
|
+ log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||
|
|
index 14ed4f212a9c9c3128c4ddbef7b2e243c925b509..16b554675a276471851846d4f2bea06fdcc166d9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||
|
|
@@ -62,6 +62,7 @@ public abstract class Projectile extends Entity {
|
||
|
|
protected void readAdditionalSaveData(CompoundTag tag) {
|
||
|
|
if (tag.hasUUID("Owner")) {
|
||
|
|
this.ownerUUID = tag.getUUID("Owner");
|
||
|
|
+ if (this instanceof ThrownEnderpearl && this.level != null && this.level.paperConfig.disableEnderpearlExploit) { this.ownerUUID = null; } // Paper - Don't store shooter name for pearls to block enderpearl travel exploit
|
||
|
|
}
|
||
|
|
|
||
|
|
this.leftOwner = tag.getBoolean("LeftOwner");
|