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

incremented version number

Browse Source
This commit is contained in:
boy0001 2014-11-08 12:01:12 +11:00
parent c606b4d893
commit c22a476908
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java
View File

@ -49,7 +49,7 @@ public class PWE {
final Location bloc = PlotHelper.getPlotBottomLoc(w, plot.id); final Location bloc = PlotHelper.getPlotBottomLoc(w, plot.id);
final Location tloc = PlotHelper.getPlotTopLoc(w, plot.id); final Location tloc = PlotHelper.getPlotTopLoc(w, plot.id);
final Vector bvec = new Vector(bloc.getBlockX() + 1, bloc.getBlockY() + 1, bloc.getBlockZ() + 1); final Vector bvec = new Vector(bloc.getBlockX() + 1, bloc.getBlockY(), bloc.getBlockZ() + 1);
final Vector tvec = new Vector(tloc.getBlockX(), tloc.getBlockY(), tloc.getBlockZ()); final Vector tvec = new Vector(tloc.getBlockX(), tloc.getBlockY(), tloc.getBlockZ());
final LocalWorld lw = PlotMain.worldEdit.wrapPlayer(p).getWorld(); final LocalWorld lw = PlotMain.worldEdit.wrapPlayer(p).getWorld();

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

@ -571,7 +571,7 @@ public class SQLManager extends AbstractDB {
if (element.contains(":")) { if (element.contains(":")) {
final String[] split = element.split(":"); final String[] split = element.split(":");
try { try {
flags.add(new Flag(FlagManager.getFlag(split[0], true), split[1])); flags.add(new Flag(FlagManager.getFlag(split[0], true), split[1].replace("´", ",").replace("¯", ":")));
} }
catch (final Exception e) { catch (final Exception e) {
exception = true; exception = true;
@ -649,7 +649,7 @@ public class SQLManager extends AbstractDB {
if (i != 0) { if (i != 0) {
flag_string.append(","); flag_string.append(",");
} }
flag_string.append(flag.getKey() + ":" + flag.getValue()); flag_string.append(flag.getKey() + ":" + flag.getValue().replace(",", "´").replace(":", "¯"));
i++; i++;
} }
runTask(new Runnable() { runTask(new Runnable() {

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

@ -176,6 +176,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (isInPlot(event.getBlock().getLocation())) { if (isInPlot(event.getBlock().getLocation())) {
if (event.getBlock().getY()==0) {
event.setCancelled(true);
return;
}
final Plot plot = getCurrentPlot(event.getBlock().getLocation()); final Plot plot = getCurrentPlot(event.getBlock().getLocation());
if (!plot.hasRights(event.getPlayer())) { if (!plot.hasRights(event.getPlayer())) {
event.setCancelled(true); event.setCancelled(true);

2
PlotSquared/src/main/resources/plugin.yml
View File

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