Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 13:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5' into v6

Browse Source
This commit is contained in:
N0tMyFaultOG 2020-09-02 17:19:12 +02:00
commit 0f9554c717
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,6 +555,7 @@ public class BlockEventListener implements Listener {
} }
if (!plot.getFlag(IceFormFlag.class)) { if (!plot.getFlag(IceFormFlag.class)) {
event.setCancelled(true); event.setCancelled(true);
plot.debug("Ice could not form because ice-form = false");
} }
} }
@ -1033,6 +1034,7 @@ public class BlockEventListener implements Listener {
} }
} else if (!plot.getFlag(BlockIgnitionFlag.class)) { } else if (!plot.getFlag(BlockIgnitionFlag.class)) {
event.setCancelled(true); event.setCancelled(true);
plot.debug("Block ignition was cancelled because block-ignition = false");
} }
} else { } else {
if (plot == null) { if (plot == null) {

16
Core/pom.xml
View File

@ -48,6 +48,12 @@
<version>1.0</version> <version>1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>20.1.0</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-core</artifactId> <artifactId>worldedit-core</artifactId>
@ -77,7 +83,7 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.25</version> <version>1.26</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -89,13 +95,7 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>1.3.72</version> <version>1.4.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>20.0.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>