EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed help menu/plot delete -> plot exit not being called

Browse Source
This commit is contained in:
boy0001 2014-11-05 15:27:49 +11:00
parent bddaadd31d
commit cb10f39753
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -29,6 +29,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.listeners.PlotListener;
/** /**
* plot functions * plot functions
@ -655,7 +656,9 @@ public class PlotHelper {
final PlotId id = PlayerFunctions.getPlot(entity.getLocation()); final PlotId id = PlayerFunctions.getPlot(entity.getLocation());
if ((id != null) && id.equals(plot.id)) { if ((id != null) && id.equals(plot.id)) {
if (entity instanceof Player) { if (entity instanceof Player) {
PlotMain.teleportPlayer((Player) entity, entity.getLocation(), plot); Player player = (Player) entity;
PlotMain.teleportPlayer(player, entity.getLocation(), plot);
PlotListener.plotExit(player, plot);
} }
else { else {
entity.remove(); entity.remove();

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -196,7 +196,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
final int start = page * perPage; final int start = page * perPage;
for (int x = start; x < max; x++) { for (int x = start; x < max; x++) {
cmd = subCommands.get(x); cmd = commands.get(x);
String s = t(C.HELP_PAGE.s()); String s = t(C.HELP_PAGE.s());
s = s.replaceAll("%alias%", cmd.alias); s = s.replaceAll("%alias%", cmd.alias);
s = s.replaceAll("%usage%", cmd.usage.contains("plot") ? cmd.usage : "/plot " + cmd.usage); s = s.replaceAll("%usage%", cmd.usage.contains("plot") ? cmd.usage : "/plot " + cmd.usage);