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 portal hack not triggering

Browse Source 
If you are falling really fast, you will be falling multiple blocks per second, and could possibly pass straight through an end portal. This fix changes the hack to use an event triggered earlier to detect if a player passes through an end portal.
This commit is contained in:
okx-code
2024-03-23 01:38:07 +00:00
parent 910222941a
commit ed045ab4e4
1 changed files with 10 additions and 6 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

@@ -4,6 +4,7 @@ import com.programmerdan.minecraft.simpleadminhacks.SimpleAdminHacks;
import com.programmerdan.minecraft.simpleadminhacks.framework.BasicHack;
import com.programmerdan.minecraft.simpleadminhacks.framework.BasicHackConfig;
import com.programmerdan.minecraft.simpleadminhacks.framework.autoload.AutoLoad;
import io.papermc.paper.event.entity.EntityInsideBlockEvent;
import org.bukkit.Bukkit;
import org.bukkit.HeightMap;
import org.bukkit.Location;
@@ -27,10 +28,12 @@ public class PortalModifyHack extends BasicHack {
}
//We want to go last incase any plugins want to cancel our attempt
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerEnterPortal(PlayerPortalEvent event) {
Player player = event.getPlayer();
if (event.getCause() != PlayerTeleportEvent.TeleportCause.END_PORTAL) {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerEnterPortal(EntityInsideBlockEvent event) {
if (!(event.getEntity() instanceof Player player)) {
return;
}
if (event.getBlock().getType() != Material.END_PORTAL) {
return;
}
World world = Bukkit.getWorld(targetWorld);
@@ -40,7 +43,7 @@ public class PortalModifyHack extends BasicHack {
Location to;
switch (getTargetWorld(player).getEnvironment()) {
case NETHER:
to = new Location(getTargetWorld(player), event.getFrom().getX(), 125, event.getFrom().getZ());
to = new Location(getTargetWorld(player), player.getLocation().getX(), 125, player.getLocation().getZ());
break;
case NORMAL:
to = getTargetWorld(player).getHighestBlockAt(player.getLocation(), HeightMap.WORLD_SURFACE).getLocation().toCenterLocation().add(0,1,0);
@@ -48,7 +51,8 @@ public class PortalModifyHack extends BasicHack {
default:
return;
}
event.setTo(to);
event.setCancelled(true);
player.teleport(to, PlayerTeleportEvent.TeleportCause.END_PORTAL);
if (to.getWorld().getName().equals(targetWorld)) {
spawnExit(to);
}