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

Update converter

Browse Source
This commit is contained in:
boy0001 2015-05-29 03:41:25 +10:00
parent 48ccc6552b
commit aa09f02413
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<artifactId>PlotSquared</artifactId> <artifactId>PlotSquared</artifactId>
<version>2.11.9</version> <version>2.11.10</version>
<name>PlotSquared</name> <name>PlotSquared</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java
View File

@ -115,12 +115,11 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
merges.put(world, new HashMap<PlotId,boolean[]>()); merges.put(world, new HashMap<PlotId,boolean[]>());
} }
} }
if (merge) { if (merge) {
int tx = r.getInt("topX"); int tx = r.getInt("topX");
int tz = r.getInt("topZ"); int tz = r.getInt("topZ");
int bx = r.getInt("bottomX"); int bx = r.getInt("bottomX") - 1;
int bz = r.getInt("bottomZ"); int bz = r.getInt("bottomZ") - 1;
int path = roadWidth.get(world); int path = roadWidth.get(world);
int plot = plotWidth.get(world); int plot = plotWidth.get(world);
Location top = getPlotTopLocAbs(path, plot, id); Location top = getPlotTopLocAbs(path, plot, id);

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -990,7 +990,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (plot != null) { if (plot != null) {
final PlotPlayer pp = BukkitUtil.getPlayer(player); final PlotPlayer pp = BukkitUtil.getPlayer(player);
if (plot.isDenied(pp.getUUID())) { if (plot.isDenied(pp.getUUID())) {
System.out.print(2);
if (Permissions.hasPermission(pp, "plots.admin.enter.denied")) { if (Permissions.hasPermission(pp, "plots.admin.enter.denied")) {
return; return;
} }