Skip to content

Commit fb55d3e

Browse files
committed
Try fixing unsafe teleportation
1 parent 892dfcd commit fb55d3e

26 files changed

+12
-24
lines changed

patches/server/0005-Add-config-for-unsafe-teleportation.patch

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@ index 0000000000000000000000000000000000000000..ea374875f529b30db17e8b8cb07b99a6
3030
+ return "allow_unsafe_teleportation";
3131
+ }
3232
+}
33-
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
34-
index 7a102b4e90fbc09b8653e5b566299efe24a04cf6..2a5db8f4ad54b772a0a8bce429fff8b539db81ed 100644
35-
--- a/src/main/java/net/minecraft/world/entity/Entity.java
36-
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
37-
@@ -4142,6 +4142,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
38-
39-
public boolean endPortalLogicAsync(BlockPos portalPos) {
40-
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
41-
+ if (me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled && !(this instanceof Player)) return false; // Luminol - Unsafe teleportation
42-
43-
ServerLevel destination = this.getServer().getLevel(this.level().getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END ? Level.OVERWORLD : Level.END);
44-
if (destination == null) {
4533
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
4634
index 5d6b1a63a2a213f8a4e81c5e574847007a82007b..77ff2a526a1d2b9307dfc696f9862bfda7407475 100644
4735
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java

patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a5321083c2367d3 100644
8+
index a90820a672379639e89c5bb71abcd9aa69227473..794f08a815672b18d22416fc5787f886f895f7be 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -109,6 +109,7 @@ import net.minecraft.world.level.block.Rotation;
@@ -16,7 +16,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108
1616
import net.minecraft.world.level.entity.EntityAccess;
1717
import net.minecraft.world.level.entity.EntityInLevelCallback;
1818
import net.minecraft.world.level.gameevent.DynamicGameEventListener;
19-
@@ -4229,13 +4230,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
19+
@@ -4228,13 +4229,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
2020
targetPos, 16, // load 16 blocks to be safe from block physics
2121
ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH,
2222
(chunks) -> {
@@ -37,7 +37,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108
3737
DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_TICKET),
3838
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
3939
)
40-
@@ -4432,6 +4438,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
40+
@@ -4431,6 +4437,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
4141
if (!this.canPortalAsync(destination, takePassengers)) {
4242
return false;
4343
}
@@ -48,7 +48,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108
4848

4949
Vec3 initialPosition = this.position();
5050
ChunkPos initialPositionChunk = new ChunkPos(
51-
@@ -4496,9 +4506,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
51+
@@ -4495,9 +4505,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
5252
info.postDimensionTransition().onTransition(teleported);
5353
}
5454

patches/server/0032-Pufferfish-Entity-TTL.patch renamed to patches/server/0031-Pufferfish-Entity-TTL.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f
4949
+ }
5050
+}
5151
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
52-
index 44a08cc2e94d52747ba6a66e4b57543dfa5f66c2..d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b 100644
52+
index 794f08a815672b18d22416fc5787f886f895f7be..8a8ad0952ac5f128aeabc0856426227bfb7b9893 100644
5353
--- a/src/main/java/net/minecraft/world/entity/Entity.java
5454
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
5555
@@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch renamed to patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44
8383
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
8484
entity.discard();
8585
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
86-
index d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b..577a194e9d9828520560e3546dba8532ca18782a 100644
86+
index 8a8ad0952ac5f128aeabc0856426227bfb7b9893..229c3d25a5999b0304b06a57819a5108c823784d 100644
8787
--- a/src/main/java/net/minecraft/world/entity/Entity.java
8888
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
8989
@@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0039-Gale-Optimize-sun-burn-tick.patch renamed to patches/server/0038-Gale-Optimize-sun-burn-tick.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index 577a194e9d9828520560e3546dba8532ca18782a..6870db1f03e44e8023e173a0d7a6a7f09f41e989 100644
8+
index 229c3d25a5999b0304b06a57819a5108c823784d..9994b61afcaa9cb93bda9f1e1db17708d95277fa 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch renamed to patches/server/0040-Gale-Skip-entity-move-if-movement-is-zero.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487c2c02c4c 100644
8+
index 9994b61afcaa9cb93bda9f1e1db17708d95277fa..45871e846223dc78aee8a8ffb087b0f0763dca67 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -28,7 +28,7 @@ index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487
2828
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
2929
// Paper start - detailed watchdog information
3030
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
31-
@@ -4978,6 +4984,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
31+
@@ -4977,6 +4983,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
3232
}
3333

3434
public final void setBoundingBox(AABB boundingBox) {

patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch renamed to patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47
332332
+ // KioCG end
333333
}
334334
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
335-
index ceb0bf3071865c85dfa5a270150ff487c2c02c4c..ae39e58170085f83303d53eb6b7eb72f0a961be3 100644
335+
index 45871e846223dc78aee8a8ffb087b0f0763dca67..d860f32f507cc4d642213a6da8227314660c4ca0 100644
336336
--- a/src/main/java/net/minecraft/world/entity/Entity.java
337337
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
338-
@@ -5999,4 +5999,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
338+
@@ -5856,4 +5856,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
339339
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
340340
}
341341
// Paper end - Expose entity id counter

patches/server/0054-Fix-MC-2025.patch renamed to patches/server/0052-Fix-MC-2025.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index ae39e58170085f83303d53eb6b7eb72f0a961be3..133fd4c50df80420015d0c32f487f0176ad07393 100644
8+
index d860f32f507cc4d642213a6da8227314660c4ca0..8e64056ed83a08037e9c5a06a03233600671637b 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
1111
@@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

0 commit comments

Comments
 (0)