CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pearled players going through portals

Browse Source 
That was being based on PlayerPortalEvent, which is no longer being called. The fix is to manually call the event.
This commit is contained in:
okx-code
2024-05-13 23:09:56 +01:00
parent 9b11393c1a
commit a8114481d0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/PortalModifyHack.java
View File

@@ -14,6 +14,7 @@ import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import java.util.HashMap;
@@ -63,10 +64,17 @@ public class PortalModifyHack extends BasicHack {
@EventHandler
public void onTick(ServerTickEndEvent event) {
for (Map.Entry<Player, Location> entry : teleports.entrySet()) {
entry.getKey().teleport(entry.getValue(), PlayerTeleportEvent.TeleportCause.END_PORTAL);
if (entry.getValue().getWorld().getName().equals(targetWorld)) {
spawnExit(entry.getValue());
}
Player player = entry.getKey();
PlayerPortalEvent portalEvent = new PlayerPortalEvent(player, player.getLocation(), entry.getValue(), PlayerTeleportEvent.TeleportCause.END_PORTAL, 0, true, 0);
Bukkit.getServer().getPluginManager().callEvent(portalEvent);
//noinspection ConstantValue
if (portalEvent.isCancelled() || portalEvent.getTo() == null || portalEvent.getTo().getWorld() == null) {
continue;
}
player.teleport(portalEvent.getTo(), PlayerTeleportEvent.TeleportCause.END_PORTAL);
if (portalEvent.getTo().getWorld().getName().equals(targetWorld)) {
spawnExit(entry.getValue());
}
}
teleports.clear();
}