Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Don't let fire spread in instances

Browse Source
This commit is contained in:
Daniel Saukel 2016-07-19 19:00:25 +02:00
parent be7681480d
commit 3d74bfac95
10 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abstract/pom.xml
View File

@ -8,6 +8,6 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
</project> </project>

2
core/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
<build> <build>
<resources> <resources>

2
core/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java
View File

@ -119,7 +119,7 @@ public class StatusCommand extends BRCommand {
String permissionPluginCorrect = getSymbol(plugin.getPermissionProvider() != null && plugin.getPermissionProvider().hasGroupSupport()); String permissionPluginCorrect = getSymbol(plugin.getPermissionProvider() != null && plugin.getPermissionProvider().hasGroupSupport());
String economyPluginCorrect = getSymbol(!plugin.getMainConfig().isEconomyEnabled() || plugin.getEconomyProvider() != null); String economyPluginCorrect = getSymbol(!plugin.getMainConfig().isEconomyEnabled() || plugin.getEconomyProvider() != null);
String commandsxlVersionCorrect = getSymbol(commandsxlVersion.startsWith("2.1")); String commandsxlVersionCorrect = getSymbol(commandsxlVersion.startsWith("2.1"));
String itemsxlVersionCorrect = getSymbol(itemsxlVersion.equals("0.1.6")); String itemsxlVersionCorrect = getSymbol(itemsxlVersion.startsWith("0.2"));
String citizensVersionCorrect = getSymbol(citizensVersion.startsWith("2.0")); String citizensVersionCorrect = getSymbol(citizensVersion.startsWith("2.0"));
String custommobsVersionCorrect = getSymbol(custommobsVersion.startsWith("4.")); String custommobsVersionCorrect = getSymbol(custommobsVersion.startsWith("4."));
String insanemobsVersionCorrect = getSymbol(insanemobsVersion.startsWith("2.")); String insanemobsVersionCorrect = getSymbol(insanemobsVersion.startsWith("2."));

13
core/src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java
View File

@ -45,6 +45,8 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.block.BlockRedstoneEvent;
@ -268,4 +270,15 @@ public class BlockListener implements Listener {
new RedstoneEventTask(event.getBlock()).runTaskLater(plugin, 1); new RedstoneEventTask(event.getBlock()).runTaskLater(plugin, 1);
} }
@EventHandler(priority = EventPriority.HIGH)
public void onIgnite(BlockIgniteEvent event) {
if (plugin.getDWorlds().getInstanceByName(event.getBlock().getWorld().getName()) == null) {
return;
}
if (event.getCause() != IgniteCause.FLINT_AND_STEEL) {
event.setCancelled(true);
}
}
} }

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

@ -4,7 +4,7 @@ version: ${project.version}${buildNo}
authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel] authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel]
description: ${project.description} description: ${project.description}
website: ${project.url} website: ${project.url}
softdepend: [BlueRoseCommons, CommandsXL, ItemsXL, Vault, Citizens, CustomMobs, InsaneMobs, MythicMobs, HolographicDisplays] softdepend: [CommandsXL, ItemsXL, Vault, Citizens, CustomMobs, InsaneMobs, MythicMobs, HolographicDisplays]
commands: commands:
dungeonsxl: dungeonsxl:
description: Reference command for DungeonsXL. description: Reference command for DungeonsXL.

2
craftbukkit_1_10_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
<build> <build>
<plugins> <plugins>

2
craftbukkit_1_9_R1/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
<build> <build>
<plugins> <plugins>

2
craftbukkit_1_9_R2/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
<build> <build>
<plugins> <plugins>

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>DungeonsXL</name> <name>DungeonsXL</name>
<url>https://dre2n.github.io</url> <url>https://dre2n.github.io</url>

2
shade/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>io.github.dre2n</groupId> <groupId>io.github.dre2n</groupId>
<artifactId>dungeonsxl</artifactId> <artifactId>dungeonsxl</artifactId>
<version>0.14.2</version> <version>0.14.3</version>
</parent> </parent>
<build> <build>
<finalName>dungeonsxl-${project.version}${buildNo}</finalName> <finalName>dungeonsxl-${project.version}${buildNo}</finalName>