Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed version number

Browse Source
This commit is contained in:
boy0001 2014-10-21 16:36:40 +11:00
parent 264baf10e3
commit 9427bc7773
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PlotSquared/src/com/intellectualcrafters/plot/C.java
View File

@ -359,7 +359,10 @@ public enum C {
*/ */
public String s() { public String s() {
if(PlotMain.translations != null){ if(PlotMain.translations != null){
this.s = PlotMain.translations.getString(this.toString()); String t = PlotMain.translations.getString(this.toString());
if (t!=null) {
this.s = t;
}
} }
if (this.s.length() < 1) { if (this.s.length() < 1) {
return this.d.replace("\\n", "\n"); return this.d.replace("\\n", "\n");

10
PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -115,6 +115,7 @@ public class PlotHelper {
PlotId id = new PlotId(x, y); PlotId id = new PlotId(x, y);
Plot plot = PlotMain.getPlots(world).get(id); Plot plot = PlotMain.getPlots(world).get(id);
Plot plot2 = null;
if (lx) { if (lx) {
if (ly) { if (ly) {
@ -125,7 +126,7 @@ public class PlotHelper {
} }
if (!plot.settings.getMerged(1)) { if (!plot.settings.getMerged(1)) {
changed = true; changed = true;
Plot plot2 = PlotMain.getPlots(world).get(new PlotId(x + 1, y)); plot2 = PlotMain.getPlots(world).get(new PlotId(x + 1, y));
mergePlot(world, plot, plot2); mergePlot(world, plot, plot2);
plot.settings.setMerged(1, true); plot.settings.setMerged(1, true);
plot2.settings.setMerged(3, true); plot2.settings.setMerged(3, true);
@ -134,7 +135,7 @@ public class PlotHelper {
if (ly) { if (ly) {
if (!plot.settings.getMerged(2)) { if (!plot.settings.getMerged(2)) {
changed = true; changed = true;
Plot plot2 = PlotMain.getPlots(world).get(new PlotId(x, y + 1)); plot2 = PlotMain.getPlots(world).get(new PlotId(x, y + 1));
mergePlot(world, plot, plot2); mergePlot(world, plot, plot2);
plot.settings.setMerged(2, true); plot.settings.setMerged(2, true);
plot2.settings.setMerged(0, true); plot2.settings.setMerged(0, true);
@ -142,7 +143,10 @@ public class PlotHelper {
} }
if (changed) { if (changed) {
result = true; result = true;
DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged()); DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
if (plot2!=null) {
DBFunc.setMerged(world.getName(), plot2, plot2.settings.getMerged());
}
} }
} }
} }

2
PlotSquared/src/plugin.yml
View File

@ -1,6 +1,6 @@
name: PlotSquared name: PlotSquared
main: com.intellectualcrafters.plot.PlotMain main: com.intellectualcrafters.plot.PlotMain
version: 2.1 version: 2.1.1
load: STARTUP load: STARTUP
description: > description: >
Easy, yet powerful Plot World generation and management. Easy, yet powerful Plot World generation and management.