Skip to content

optimize portal ticker loop and eliminate uninitialized reflection checks #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spagles wants to merge 1 commit into
base: master
Choose a base branch
from
Open

optimize portal ticker loop and eliminate uninitialized reflection checks #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 6 additions & 32 deletions src/main/java/de/emilo/instantnetherportals/PortalListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.scheduler.BukkitRunnable;

import java.lang.reflect.Field;
Expand All @@ -24,7 +21,6 @@ public class PortalListener implements Listener {
private boolean reflectionReady = false;
private Field portalProcessField; // Entity -> PortalProcessor
private Field processorTimeField; // PortalProcessor -> int portalTime
private Field portalCooldownField; // Entity -> int portalCooldown
private Method getPortalWaitTimeMethod;
private Method getHandleMethod;

Expand All @@ -46,8 +42,8 @@ public void run() {
if (!config.isEnabled()) return;
for (Player player : plugin.getServer().getOnlinePlayers()) {
if (!player.hasPermission("instantnetherportals.use")) continue;
if (player.getPortalCooldown() > 0) continue;
if (!isInNetherPortal(player)) continue;
if (hasPortalCooldown(player)) continue;
acceleratePortal(player);
}
}
Expand All @@ -62,15 +58,15 @@ public void run() {
private void acceleratePortal(Player player) {
if (!ensureReflection(player)) return;

int maxTime = resolveMaxTime(player);
int delay = config.getTeleportDelay();
if (delay >= maxTime) return;

try {
Object nms = getHandleMethod.invoke(player);
Object pp = portalProcessField.get(nms); // PortalProcessor instance
if (pp == null) return; // Created next tick by the game

int maxTime = resolveMaxTime(nms);
int delay = config.getTeleportDelay();
if (delay >= maxTime) return;

int currentTime = processorTimeField.getInt(pp);
int targetTime = maxTime - delay;

Expand All @@ -83,16 +79,6 @@ private void acceleratePortal(Player player) {
}
}

// -----------------------------------------------------------------------
// Cleanup on successful portal teleport
// -----------------------------------------------------------------------

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerTeleport(PlayerTeleportEvent event) {
// portalProcess is set to null by the game after teleportation,
// so no manual cleanup needed – the tick task handles it automatically.
}

// -----------------------------------------------------------------------
// Helpers
// -----------------------------------------------------------------------
Expand All @@ -104,16 +90,6 @@ private boolean isInNetherPortal(Player player) {
|| torso.getType() == Material.NETHER_PORTAL;
}

private boolean hasPortalCooldown(Player player) {
if (portalCooldownField == null || getHandleMethod == null) return false;
try {
Object nms = getHandleMethod.invoke(player);
return portalCooldownField.getInt(nms) > 0;
} catch (Exception e) {
return false;
}
}

// -----------------------------------------------------------------------
// NMS reflection (pure reflection – no NMS imports needed)
// -----------------------------------------------------------------------
Expand All @@ -133,7 +109,6 @@ private boolean ensureReflection(Player player) {
return false;
}

portalCooldownField = getDeclaredFieldSafe(entityClass, "portalCooldown");
getPortalWaitTimeMethod = findMethod(nms.getClass(), "getPortalWaitTime");

// In Paper 1.21.8 portalTime lives inside PortalProcessor
Expand All @@ -158,10 +133,9 @@ private boolean ensureReflection(Player player) {
return processorTimeField != null;
}

private int resolveMaxTime(Player player) {
private int resolveMaxTime(Object nms) {
if (getPortalWaitTimeMethod == null) return VANILLA_WAIT_TIME;
try {
Object nms = getHandleMethod.invoke(player);
int v = (int) getPortalWaitTimeMethod.invoke(nms);
return v > 0 ? v : VANILLA_WAIT_TIME;
} catch (Exception e) {
Expand Down