diff --git a/src/main/java/org/ultramine/mods/privreg/modules/RegionModuleBasic.java b/src/main/java/org/ultramine/mods/privreg/modules/RegionModuleBasic.java index 5c9af16..9a82dfa 100644 --- a/src/main/java/org/ultramine/mods/privreg/modules/RegionModuleBasic.java +++ b/src/main/java/org/ultramine/mods/privreg/modules/RegionModuleBasic.java @@ -73,6 +73,7 @@ public static final OwnerRight RIGHT_ATTACK_GUESTS = RightRegistry.register("modbasic", "attack_guests"); public static final OwnerRight RIGHT_ATTACK_ANIMALS = RightRegistry.register("modbasic", "attack_animals"); public static final OwnerRight RIGHT_ATTACK_MONSTERS = RightRegistry.register("modbasic", "attack_monsters"); + public static final OwnerRight RIGHT_ATTACK_OTHER_ENTITIES = RightRegistry.register("modbasic", "attack_other_entities"); private boolean disableItemsMode; private String[] disableItemsRaw = new String[0]; @@ -156,6 +157,7 @@ this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_GUESTS, true); this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_ANIMALS, true); this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_MONSTERS, true); + this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_OTHER_ENTITIES, true); } @@ -175,6 +177,7 @@ this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_GUESTS, false); this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_ANIMALS, false); this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_MONSTERS, false); + this.region.getOwnerStorage().registerRight(RIGHT_ATTACK_OTHER_ENTITIES, false); } super.onRemoveFromRegion(); } @@ -377,6 +380,14 @@ player.addChatMessage(new ChatComponentTranslation("privreg.msg.monsters")); } } + else + { + if(!region.hasRight(profile, RIGHT_ATTACK_OTHER_ENTITIES)) + { + e.setCanceled(true); + player.addChatMessage(new ChatComponentTranslation("privreg.msg.other_entities")); + } + } } @SideOnly(Side.SERVER) diff --git a/src/main/resources/assets/privreg/lang/en_US.lang b/src/main/resources/assets/privreg/lang/en_US.lang index 51ae7e4..1ee96a5 100644 --- a/src/main/resources/assets/privreg/lang/en_US.lang +++ b/src/main/resources/assets/privreg/lang/en_US.lang @@ -82,6 +82,7 @@ privreg.right.modbasic.attack_guests=Damage guests privreg.right.modbasic.attack_animals=Damage animals privreg.right.modbasic.attack_monsters=Damage monsters +privreg.right.modbasic.attack_other_entities=Damage other entities #| privreg.gui.charger.action=Convert #| @@ -120,6 +121,7 @@ privreg.msg.pvp=§cPvP is prohibited in the area privreg.msg.animals=§cDamage animals is prohibited in the area privreg.msg.monsters=§cDamage monsters is prohibited in the area +privreg.msg.other_entities=§cDamage other entities is prohibited in the area privreg.msg.command=§cUsing of this command is prohibited in the area item.privreg.region.name=Region block diff --git a/src/main/resources/assets/privreg/lang/ru_RU.lang b/src/main/resources/assets/privreg/lang/ru_RU.lang index 3a206c4..20122f2 100644 --- a/src/main/resources/assets/privreg/lang/ru_RU.lang +++ b/src/main/resources/assets/privreg/lang/ru_RU.lang @@ -82,6 +82,7 @@ privreg.right.modbasic.attack_guests=Наносить урон гостям privreg.right.modbasic.attack_animals=Наносить урон животным privreg.right.modbasic.attack_monsters=Наносить урон монстрам +privreg.right.modbasic.attack_other_entities=Наносить урон другим Entity #| privreg.gui.charger.action=Преобразовать #| @@ -120,6 +121,7 @@ privreg.msg.pvp=§cPvP запрещено на данной территории privreg.msg.animals=§cУбийство животных запрещено на данной территории privreg.msg.monsters=§cУбийство монстров запрещено на данной территории +privreg.msg.other_entities=§cНанесение урона другим Entity запрещено на данной территории privreg.msg.command=Использование данной команды запрещено на данной территории