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

Updated messages / version incrementation

Browse Source
This commit is contained in:
boy0001 2015-01-31 18:35:12 +11:00
parent 25355f4906
commit 27da7070b2
2 changed files with 53 additions and 27 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.6.1</version> <version>2.6.2</version>
<name>PlotSquared</name> <name>PlotSquared</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>

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

@ -278,8 +278,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (PlotMain.hasPermission(event.getPlayer(), "plots.admin.destroy.road")) { if (PlotMain.hasPermission(event.getPlayer(), "plots.admin.destroy.road")) {
return; return;
} }
PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.destroy.road"); if (isCluster(loc)) {
if (isCluster(loc)) { event.setCancelled(true); } PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.destroy.road");
event.setCancelled(true);
}
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@ -343,8 +345,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
} else if (!plot.hasRights(p)) { } else if (!plot.hasRights(p)) {
if (!PlotMain.hasPermission(p, "plots.admin.build.other")) { if (!PlotMain.hasPermission(p, "plots.admin.build.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); if (isCluster(loc)) {
if (isCluster(loc)) { event.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
event.setCancelled(true);
}
} }
} }
} }
@ -505,8 +509,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (PlotMain.hasPermission(player, "plots.admin.interact.road")) { if (PlotMain.hasPermission(player, "plots.admin.interact.road")) {
return; return;
} }
PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.interact.road"); if (isCluster(loc)) {
if (isCluster(loc)) { event.setCancelled(true); } PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.interact.road");
event.setCancelled(true);
}
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@ -573,8 +579,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
} else if (!plot.hasRights(p)) { } else if (!plot.hasRights(p)) {
if (!PlotMain.hasPermission(p, "plots.admin.build.other")) { if (!PlotMain.hasPermission(p, "plots.admin.build.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); if (isCluster(loc)) {
if (isCluster(loc)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
e.setCancelled(true);
}
} }
} }
} }
@ -642,8 +650,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (PlotMain.hasPermission(p, "plots.admin.build.other")) { if (PlotMain.hasPermission(p, "plots.admin.build.other")) {
return; return;
} }
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); if (isCluster(loc)) {
if (isCluster(loc)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
e.setCancelled(true);
}
} }
} }
} }
@ -704,8 +714,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (PlotMain.hasPermission(p, "plots.admin.build.other")) { if (PlotMain.hasPermission(p, "plots.admin.build.other")) {
return; return;
} }
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); if (isCluster(loc)) {
if (isCluster(loc)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
e.setCancelled(true);
}
} }
} }
} }
@ -734,8 +746,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(p, "plots.admin.build.other")) { if (!PlotMain.hasPermission(p, "plots.admin.build.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other"); if (isCluster(loc)) {
if (isCluster(loc)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.build.other");
e.setCancelled(true);
}
} }
} }
} }
@ -766,8 +780,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(p, "plots.admin.destroy.other")) { if (!PlotMain.hasPermission(p, "plots.admin.destroy.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.destroy.other"); if (isCluster(l)) {
if (isCluster(l)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.destroy.other");
e.setCancelled(true);
}
} }
} }
} }
@ -807,8 +823,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(p, "plots.admin.interact.other")) { if (!PlotMain.hasPermission(p, "plots.admin.interact.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.interact.other"); if (isCluster(l)) {
if (isCluster(l)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.interact.other");
e.setCancelled(true);
}
} }
} }
} }
@ -843,8 +861,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(p, "plots.admin.vehicle.break.other")) { if (!PlotMain.hasPermission(p, "plots.admin.vehicle.break.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.vehicle.break.other"); if (isCluster(l)) {
if (isCluster(l)) { e.setCancelled(true); } e.setCancelled(true);
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.vehicle.break.other");
}
} }
} }
} }
@ -898,8 +918,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(p, "plots.admin.pve.other")) { if (!PlotMain.hasPermission(p, "plots.admin.pve.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.pve.other"); if (isCluster(l)) {
if (isCluster(l)) { e.setCancelled(true); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.pve.other");
e.setCancelled(true);
}
} }
} }
} }
@ -926,8 +948,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
} }
} else if (!plot.hasRights(p)) { } else if (!plot.hasRights(p)) {
if (!PlotMain.hasPermission(p, "plots.admin.projectile.other")) { if (!PlotMain.hasPermission(p, "plots.admin.projectile.other")) {
PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.projectile.other"); if (isCluster(l)) {
if (isCluster(l)) { e.setHatching(false); } PlayerFunctions.sendMessage(p, C.NO_PERMISSION, "plots.admin.projectile.other");
e.setHatching(false);
}
} }
} }
} }
@ -965,8 +989,10 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
if (!PlotMain.hasPermission(player, "plots.admin.build.road")) { if (!PlotMain.hasPermission(player, "plots.admin.build.road")) {
PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.build.road"); if (isCluster(loc)) {
if (isCluster(loc)) { event.setCancelled(true); } PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.admin.build.road");
event.setCancelled(true);
}
} }
} }
} }