Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-26 09:11:55 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible memory leak; resolves #746

Browse Source
This commit is contained in:
Daniel Saukel 2020-04-03 20:46:25 +02:00
parent cc2004b30b
commit 38700a3c62
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandTask.java
View File

@ -49,7 +49,7 @@ public class CommandTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
if (isWorldFinished()) { if (sign.isWorldFinished()) {
sign.deactivate(); sign.deactivate();
return; return;
} }

7
core/src/main/java/de/erethon/dungeonsxl/sign/windup/DelayedPowerTask.java
View File

@ -16,6 +16,7 @@
*/ */
package de.erethon.dungeonsxl.sign.windup; package de.erethon.dungeonsxl.sign.windup;
import de.erethon.dungeonsxl.api.DungeonsAPI;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
/** /**
@ -23,17 +24,19 @@ import org.bukkit.scheduler.BukkitRunnable;
*/ */
public class DelayedPowerTask extends BukkitRunnable { public class DelayedPowerTask extends BukkitRunnable {
private DungeonsAPI api;
private RedstoneSign sign; private RedstoneSign sign;
private boolean enable; private boolean enable;
public DelayedPowerTask(RedstoneSign sign, boolean enable) { public DelayedPowerTask(DungeonsAPI api, RedstoneSign sign, boolean enable) {
this.sign = sign; this.sign = sign;
this.enable = enable; this.enable = enable;
} }
@Override @Override
public void run() { public void run() {
if (isWorldFinished()) { if (api.getGameWorld(sign.getSign().getWorld()) != null) {
sign.getEnableTask().cancel(); sign.getEnableTask().cancel();
sign.getDisableTask().cancel(); sign.getDisableTask().cancel();
return; return;

6
core/src/main/java/de/erethon/dungeonsxl/sign/windup/DropSign.java
View File

@ -93,10 +93,14 @@ public class DropSign extends Windup {
setRunnable(new BukkitRunnable() { setRunnable(new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (isWorldFinished()) {
deactivate();
return;
}
try { try {
spawnLocation.getWorld().dropItem(spawnLocation, getItem()); spawnLocation.getWorld().dropItem(spawnLocation, getItem());
} catch (NullPointerException exception) { } catch (NullPointerException exception) {
cancel(); deactivate();
} }
} }
}); });

2
core/src/main/java/de/erethon/dungeonsxl/sign/windup/MobSpawnTask.java
View File

@ -35,7 +35,7 @@ public class MobSpawnTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
if (isWorldFinished()) { if (sign.isWorldFinished()) {
sign.deactivate(); sign.deactivate();
return; return;
} }

5
core/src/main/java/de/erethon/dungeonsxl/sign/windup/RedstoneSign.java
View File

@ -22,7 +22,6 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
import de.erethon.dungeonsxl.api.sign.Rocker; import de.erethon.dungeonsxl.api.sign.Rocker;
import de.erethon.dungeonsxl.api.world.InstanceWorld; import de.erethon.dungeonsxl.api.world.InstanceWorld;
import de.erethon.dungeonsxl.player.DPermission; import de.erethon.dungeonsxl.player.DPermission;
import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@ -157,11 +156,11 @@ public class RedstoneSign extends Rocker {
} }
if (delay > 0) { if (delay > 0) {
enableTask = new DelayedPowerTask(this, true).runTaskTimer(api, delay, delay + offDelay); enableTask = new DelayedPowerTask(api, this, true).runTaskTimer(api, delay, delay + offDelay);
if (repeat != 1) { if (repeat != 1) {
repeatsToDo = repeat; repeatsToDo = repeat;
disableTask = new DelayedPowerTask(this, false).runTaskTimer(api, delay + offDelay, delay + offDelay); disableTask = new DelayedPowerTask(api, this, false).runTaskTimer(api, delay + offDelay, delay + offDelay);
} }
} else { } else {