Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed breakBlocks and ProtectedEntities settings

This commit is contained in:
Kikisito 2021-03-05 00:16:11 +01:00
parent 5e7b28ea55
commit 217da6c13d
12 changed files with 322 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
adapter/dungeonsxl-adapter.iml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-api" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

34
addon/core/dungeonsxl-addon-core.iml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT" level="project" />
<orderEntry type="module" module-name="dungeonsxl-dist" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-adapter" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_blockdata" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_magicvalues" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-core" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.alessiodp.parties:parties-api:2.6.14" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

32
addon/dist/dungeonsxl-addon-dist.iml vendored Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-addon-core" />
<orderEntry type="module" module-name="dungeonsxl-dist" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-adapter" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_blockdata" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_magicvalues" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-core" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.alessiodp.parties:parties-api:2.6.14" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

31
addon/dungeonsxl-addon.iml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-dist" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-adapter" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-api" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_blockdata" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_magicvalues" scope="PROVIDED" />
<orderEntry type="module" module-name="dungeonsxl-core" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.alessiodp.parties:parties-api:2.6.14" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

31
api/dungeonsxl-api.iml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

33
bukkit_blockdata/dungeonsxl-bukkit_blockdata.iml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-adapter" />
<orderEntry type="module" module-name="dungeonsxl-api" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

36
bukkit_magicvalues/dungeonsxl-bukkit_magicvalues.iml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-adapter" />
<orderEntry type="module" module-name="dungeonsxl-api" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

44
core/dungeonsxl-core.iml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-adapter" />
<orderEntry type="module" module-name="dungeonsxl-api" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_blockdata" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_magicvalues" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.citizensnpcs:citizens:2.0.25-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.gmail.filoghost.holographicdisplays:holographicdisplays-api:2.4.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.black_ixx:BossShop:2.7.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.griefcraft:Modern-LWC:2.1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
<orderEntry type="library" name="Maven: com.alessiodp.parties:parties-api:2.6.14" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

4
core/src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java
View File

@ -556,6 +556,10 @@ public class DGameWorld extends DInstanceWorld implements GameWorld {
return false;
}
if(getRules().getState(GameRule.BREAK_BLOCKS)){
return false;
}
return true;
}

2
core/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java
View File

@ -226,7 +226,7 @@ public class DWorldListener implements Listener {
}
GameRuleContainer rules = gameWorld.getDungeon().getRules();
Set<ExMob> prot = interact ? rules.getState(GameRule.INTERACTION_PROTECTED_ENTITIES) : rules.getState(GameRule.DAMAGE_PROTECTED_ENTITIES);
if (prot.contains(caliburn.getExMob(entity))) {
if (!rules.getState(GameRule.BREAK_BLOCKS) && prot.contains(caliburn.getExMob(entity))) {
event.setCancelled(true);
}
}

30
dist/dungeonsxl-dist.iml vendored Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="dungeonsxl-adapter" />
<orderEntry type="module" module-name="dungeonsxl-api" />
<orderEntry type="library" name="Maven: de.erethon.commons:commons-dist:6.2.2" level="project" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_blockdata" />
<orderEntry type="module" module-name="dungeonsxl-bukkit_magicvalues" />
<orderEntry type="module" module-name="dungeonsxl-core" />
<orderEntry type="library" name="Maven: com.alessiodp.parties:parties-api:2.6.14" level="project" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>

14
dungeonsxl-parent.iml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: de.erethon:caliburn:1.0-RC-07" level="project" />
<orderEntry type="library" name="Maven: de.erethon.vignette:vignette-dist:1.0-SNAPSHOT-24" level="project" />
</component>
</module>