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

Minor fixes

Browse Source 
Fixes #797
Fixes #794
This commit is contained in:
Jesse Boyd
2016-01-12 23:13:47 +11:00
parent af79100f7d
commit ad1272b0e5
11 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -451,7 +451,12 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
}
if (Settings.TELEPORT_ON_LOGIN && plot != null) {
MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
TaskManager.runTask(new Runnable() {
@Override
public void run() {
MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
}
});
MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
}
}
@ -467,6 +472,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
final Player player = event.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(player);
// Cancel teleport
TaskManager.TELEPORT_QUEUE.remove(pp.getName());
// Set last location
Location loc = BukkitUtil.getLocation(to);
pp.setMeta("location", loc);
@ -524,6 +532,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
final Player player = event.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(player);
// Cancel teleport
TaskManager.TELEPORT_QUEUE.remove(pp.getName());
// Set last location
Location loc = BukkitUtil.getLocation(to);
pp.setMeta("location", loc);

3
src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
View File

@ -58,7 +58,6 @@ public class BukkitLazyBlock extends LazyBlock {
case 47:
case 48:
case 49:
case 50:
case 51:
case 52:
case 54:
@ -76,8 +75,6 @@ public class BukkitLazyBlock extends LazyBlock {
case 11:
case 73:
case 74:
case 75:
case 76:
case 78:
case 79:
case 80:

7
src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
View File

@ -23,7 +23,6 @@ package com.plotsquared.bukkit.util;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -44,13 +43,10 @@ import com.intellectualcrafters.jnbt.StringTag;
import com.intellectualcrafters.jnbt.Tag;
import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.SchematicHandler;
import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.object.schematic.StateWrapper;
@ -200,7 +196,6 @@ public class BukkitSchematicHandler extends SchematicHandler {
case 45:
case 46:
case 47:
case 48:
case 48:
case 49:
case 51:
@ -214,8 +209,6 @@ public class BukkitSchematicHandler extends SchematicHandler {
case 9:
case 10:
case 11:
case 73:
case 74:
case 73:
case 74:
case 78:

3
src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
View File

@ -149,7 +149,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 47:
case 48:
case 49:
case 50:
case 51:
case 52:
case 54:
@ -167,8 +166,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 11:
case 73:
case 74:
case 75:
case 76:
case 78:
case 79:
case 80:

3
src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
View File

@ -173,7 +173,6 @@ public class SpongeSchematicHandler extends SchematicHandler {
case 47:
case 48:
case 49:
case 50:
case 51:
case 55:
case 56:
@ -187,8 +186,6 @@ public class SpongeSchematicHandler extends SchematicHandler {
case 11:
case 73:
case 74:
case 75:
case 76:
case 78:
case 79:
case 80: