EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge v5 into v6

Browse Source
This commit is contained in:
N0tMyFaultOG
2020-08-12 18:20:37 +02:00
parent 6e16ef1246 924b73f070
commit 2b17f730d4
10 changed files with 223 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
View File

@ -452,26 +452,28 @@ public class BlockEventListener implements Listener {
if (plot == null) {
return;
}
switch (event.getSource().getType()) {
case GRASS_BLOCK:
switch (event.getSource().getType().toString()) {
case "GRASS_BLOCK":
if (!plot.getFlag(GrassGrowFlag.class)) {
plot.debug("Grass could not grow because grass-grow = false");
event.setCancelled(true);
}
break;
case MYCELIUM:
case "MYCELIUM":
if (!plot.getFlag(MycelGrowFlag.class)) {
plot.debug("Mycelium could not grow because mycel-grow = false");
event.setCancelled(true);
}
break;
case VINE:
case "WEEPING_VINES":
case "TWISTING_VINES":
case "VINE":
if (!plot.getFlag(VineGrowFlag.class)) {
plot.debug("Vine could not grow because vine-grow = false");
event.setCancelled(true);
}
break;
case KELP:
case "KELP":
if (!plot.getFlag(KelpGrowFlag.class)) {
plot.debug("Kelp could not grow because kelp-grow = false");
event.setCancelled(true);

1
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
View File

@ -150,6 +150,7 @@ public class EntityEventListener implements Listener {
event.setCancelled(true);
return;
}
break;
case "BREEDING":
if (!area.isSpawnBreeding()) {
event.setCancelled(true);

1
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
View File

@ -201,6 +201,7 @@ public class PaperListener implements Listener {
event.setCancelled(true);
return;
}
break;
case "BREEDING":
if (!area.isSpawnBreeding()) {
event.setShouldAbortSpawn(true);