Upstream
/
GriefDefender
mirror of https://github.com/bloodmc/GriefDefender.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'fire-spread' and 'vehicle-use' flag definitions.

This commit is contained in:
bloodshot 2020-05-06 22:51:41 -04:00
parent be212c8761
commit 0f1882c387
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bukkit/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
View File

@ -171,12 +171,7 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
List<FlagData> flagData = new ArrayList<>();
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_DAMAGE)
.context(FlagContexts.SOURCE_FIRE)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.BLOCK_MODIFY)
.flag(Flags.BLOCK_SPREAD)
.context(FlagContexts.SOURCE_FIRE)
.build());
this.registerCustomType(
@ -1021,31 +1016,37 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
.build())
.build());
flagContexts = new HashSet<>();
flagContexts.add(FlagContexts.SOURCE_PLAYER);
flagContexts.add(FlagContexts.USED_ITEM_VEHICLE);
flagData = new ArrayList<>();
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_BLOCK_SECONDARY)
.context(new Context(ContextKeys.USED_ITEM, ContextGroupKeys.VEHICLE))
.contexts(flagContexts)
.build());
flagContexts = new HashSet<>();
flagContexts.add(FlagContexts.SOURCE_PLAYER);
flagContexts.add(FlagContexts.TARGET_TYPE_VEHICLE);
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_ITEM_SECONDARY)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_DAMAGE)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_RIDING)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_ENTITY_SECONDARY)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
this.registerCustomType(
definitionBuilder

23
sponge/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
View File

@ -171,12 +171,7 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
List<FlagData> flagData = new ArrayList<>();
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_DAMAGE)
.context(FlagContexts.SOURCE_FIRE)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.BLOCK_MODIFY)
.flag(Flags.BLOCK_SPREAD)
.context(FlagContexts.SOURCE_FIRE)
.build());
this.registerCustomType(
@ -1021,31 +1016,37 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
.build())
.build());
flagContexts = new HashSet<>();
flagContexts.add(FlagContexts.SOURCE_PLAYER);
flagContexts.add(FlagContexts.USED_ITEM_VEHICLE);
flagData = new ArrayList<>();
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_BLOCK_SECONDARY)
.context(new Context(ContextKeys.USED_ITEM, ContextGroupKeys.VEHICLE))
.contexts(flagContexts)
.build());
flagContexts = new HashSet<>();
flagContexts.add(FlagContexts.SOURCE_PLAYER);
flagContexts.add(FlagContexts.TARGET_TYPE_VEHICLE);
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_ITEM_SECONDARY)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_DAMAGE)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.ENTITY_RIDING)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
flagData.add(flagDataBuilder
.reset()
.flag(Flags.INTERACT_ENTITY_SECONDARY)
.context(FlagContexts.TARGET_TYPE_VEHICLE)
.contexts(flagContexts)
.build());
this.registerCustomType(
definitionBuilder