Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-05 05:27:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

2 Fixes (PlotMe conversion, pve)

Browse Source 
- Fixed PlotMe conversion -> MySQL for < 5K plots.
- Fixed admin PVE bypass on unowned plots
This commit is contained in:
boy0001 2015-06-13 17:55:40 +10:00
parent 5621570772
commit 5526d4a226
3 changed files with 6 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>
</properties>
<artifactId>PlotSquared</artifactId>
<version>2.11.20</version>
<version>2.11.21</version>
<name>PlotSquared</name>
<packaging>jar</packaging>
<build>

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
View File

@ -343,7 +343,7 @@ public class SQLManager implements AbstractDB {
for (int j = 0; j <= amount; j++) {
final List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
if (subList.size() == 0) {
return;
break;
}
if (last == -1) {
last = subList.size();
@ -364,7 +364,7 @@ public class SQLManager implements AbstractDB {
last = subList.size();
preparedStmt.addBatch();
}
PlotSquared.log("&aSuccess 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
PlotSquared.log("&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
preparedStmt.executeBatch();
preparedStmt.clearParameters();
preparedStmt.close();
@ -406,7 +406,7 @@ public class SQLManager implements AbstractDB {
last = subList.size();
preparedStmt.addBatch();
}
PlotSquared.log("&aSuccess 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
PlotSquared.log("&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
preparedStmt.executeBatch();
preparedStmt.clearParameters();
preparedStmt.close();
@ -430,7 +430,7 @@ public class SQLManager implements AbstractDB {
PlotSquared.log("&c[ERROR] " + "Failed to save " + obj + "!");
}
}
PlotSquared.log("&aSuccess 3");
PlotSquared.log("&aBatch 3");
preparedStmt.executeBatch();
preparedStmt.close();
}

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

@ -1465,6 +1465,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
e.setCancelled(true);
return;
}
return;
} else if (aPlr && FlagManager.isPlotFlagTrue(plot, "pvp")) {
return;
}