Helvetica Volubi
89 lines
5.8 KiB
Diff
89 lines
5.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Fri, 1 May 2026 21:52:07 +0800
|
|
Subject: [PATCH] Prevent teleprotAsync calls in move events
|
|
|
|
|
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index c86b1fd5e200c478d178be32791b6e8c960d47e2..9be6d486082d344fb91fd74207eee83ca2f8e869 100644
|
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -730,7 +730,9 @@ public class ServerGamePacketListenerImpl
|
|
|
|
Location oldTo = to.clone();
|
|
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
|
|
+ this.player.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
|
|
this.cserver.getPluginManager().callEvent(event);
|
|
+ this.player.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
|
|
|
|
// If the event is cancelled we move the player back to their old location.
|
|
if (event.isCancelled()) {
|
|
@@ -1741,7 +1743,9 @@ public class ServerGamePacketListenerImpl
|
|
|
|
Location oldTo = to.clone();
|
|
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
|
|
+ this.player.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
|
|
this.cserver.getPluginManager().callEvent(event);
|
|
+ this.player.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
|
|
|
|
// If the event is cancelled we move the player back to their old location.
|
|
if (event.isCancelled()) {
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index bb02a5d2e752c7a3f0aba9ff115f3df61b9e141a..33b6f6c0316af44e47370a55e3515df4e3b706b6 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -4478,12 +4478,25 @@ public abstract class Entity
|
|
teleportTarget.cause(), teleportFlags, teleportComplete
|
|
);
|
|
}
|
|
+ // Luminol start - Prevent teleprotAsync calls in move events
|
|
+ public boolean blockTeleportAsync = false;
|
|
+ // Luminol end
|
|
|
|
public final boolean teleportAsync(ServerLevel destination, Vec3 pos, Float yaw, Float pitch, Vec3 velocity,
|
|
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, long teleportFlags,
|
|
java.util.function.Consumer<Entity> teleportComplete) {
|
|
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot teleport entity async");
|
|
|
|
+ // Luminol start - Prevent teleprotAsync calls in move events
|
|
+ if (this.blockTeleportAsync && me.earthme.luminol.config.modules.fixes.PreventIncorrectTeleportAsyncConfig.enabled) {
|
|
+ if (me.earthme.luminol.config.modules.fixes.PreventIncorrectTeleportAsyncConfig.throwWhenCaught) {
|
|
+ throw new IllegalStateException("Call teleportAsync during move events!");
|
|
+ }
|
|
+
|
|
+ LOGGER.error("Calling teleportAsync during move events!", new Throwable());
|
|
+ return false;
|
|
+ }
|
|
+ // Luminol end
|
|
if (!ServerLevel.isInSpawnableBounds(new BlockPos(ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockX(pos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockY(pos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getBlockZ(pos)))) {
|
|
return false;
|
|
}
|
|
diff --git a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
|
|
index 3fcd534cee1f605a710ffc43eff4b5106c7dd40c..9b887b40236a212de513e3ceece1abfec5372ae2 100644
|
|
--- a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
|
|
+++ b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java
|
|
@@ -282,7 +282,9 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
|
|
|
|
if (this.lastLocation != null && !this.lastLocation.equals(to)) {
|
|
org.bukkit.event.vehicle.VehicleMoveEvent event = new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, this.lastLocation, to);
|
|
+ this.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
|
|
event.callEvent();
|
|
+ this.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
|
|
}
|
|
this.lastLocation = vehicle.getLocation();
|
|
// CraftBukkit end
|
|
diff --git a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
|
|
index 30b99d9d0944399e6f3a74c4310cbf8f15cc5adc..9a414d8a1a2e95f2843d8f6e65cf5ad0b742bb26 100644
|
|
--- a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
|
|
+++ b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java
|
|
@@ -318,7 +318,9 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle).callEvent();
|
|
|
|
if (!from.equals(to)) {
|
|
+ this.blockTeleportAsync = true; // Luminol - Prevent teleprotAsync calls during move events
|
|
new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to).callEvent();
|
|
+ this.blockTeleportAsync = false; // Luminol - Prevent teleprotAsync calls during move events
|
|
}
|
|
// CraftBukkit end
|
|
this.updateFluidInteraction();
|