EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-11 01:54:41 +02:00
Code Issues Projects Releases Wiki Activity

Various

Browse Source 
externalize strings
plotme conversion fixes
This commit is contained in:
Jesse Boyd
2016-09-26 18:31:08 +10:00
parent c99e23bd3c
commit 12f8861d07
66 changed files with 655 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
View File

@ -1,5 +1,6 @@
package com.plotsquared.bukkit.object;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.EconHandler;
@ -67,7 +68,7 @@ public class BukkitPlayer extends PlotPlayer {
PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to);
RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
for (RegisteredListener listener : listeners) {
if (listener.getPlugin().getName().equals("PlotSquared")) {
if (listener.getPlugin().getName().equals(PS.imp().getPluginName())) {
continue;
}
try {
@ -81,7 +82,7 @@ public class BukkitPlayer extends PlotPlayer {
}
event = new PlayerTeleportEvent(player, to, from);
for (RegisteredListener listener : listeners) {
if (listener.getPlugin().getName().equals("PlotSquared")) {
if (listener.getPlugin().getName().equals(PS.imp().getPluginName())) {
continue;
}
try {