diff --git a/src/main/java/org/ultramine/server/internal/UMEventHandler.java b/src/main/java/org/ultramine/server/internal/UMEventHandler.java index 1155e5a..5a2812e 100644 --- a/src/main/java/org/ultramine/server/internal/UMEventHandler.java +++ b/src/main/java/org/ultramine/server/internal/UMEventHandler.java @@ -15,7 +15,6 @@ import org.ultramine.server.util.BasicTypeParser; import org.ultramine.server.util.WarpLocation; -import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.functions.GenericIterableFactory; @@ -24,7 +23,6 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentStyle; @@ -41,17 +39,14 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.ServerChatEvent; -import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent; import org.ultramine.core.permissions.Permissions; public class UMEventHandler { @InjectService private static Permissions perms; - + @SideOnly(Side.SERVER) @SubscribeEvent(priority = EventPriority.HIGH) public void checkChatPermission(ServerChatEvent e) @@ -59,12 +54,7 @@ if(e.player.playerNetServerHandler == null || e.player.getData() == null) return; PlayerCoreData data = e.player.getData().core(); - if(!perms.has(e.player, "ability.player.chat")) - { - e.setCanceled(true); - e.player.addChatMessage(new ChatComponentTranslation("ultramine.ability.chat").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - else if(data.isMuted()) + if(data.isMuted()) { e.setCanceled(true); if(data.getUnmuteTime() != Long.MAX_VALUE) @@ -246,72 +236,6 @@ } @SideOnly(Side.SERVER) - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onBreakEvent(BlockEvent.BreakEvent e) - { - if(!e.getPlayer().isEntityPlayerMP() || ((EntityPlayerMP)e.getPlayer()).playerNetServerHandler == null) - return; - if(!perms.has(e.getPlayer(), "ability.player.blockbreak")) - { - e.setCanceled(true); - e.getPlayer().addChatMessage(new ChatComponentTranslation("ultramine.ability.blockbreak").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - } - - @SideOnly(Side.SERVER) - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlaceEvent(BlockEvent.PlaceEvent e) - { - if(!e.player.isEntityPlayerMP() || ((EntityPlayerMP)e.player).playerNetServerHandler == null) - return; - if(!perms.has(e.player, "ability.player.blockplace")) - { - e.setCanceled(true); - e.player.addChatMessage(new ChatComponentTranslation("ultramine.ability.blockplace").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - } - - @SideOnly(Side.SERVER) - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerInteractEvent(PlayerInteractEvent e) - { - if(!e.entityPlayer.isEntityPlayerMP() || ((EntityPlayerMP)e.entityPlayer).playerNetServerHandler == null) - return; - if(!perms.has(e.entityPlayer, "ability.player.useitem")) - { - e.useItem = Event.Result.DENY; - if(e.entityPlayer.inventory.getCurrentItem() != null) - e.entityPlayer.addChatMessage(new ChatComponentTranslation("ultramine.ability.useitem").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - if(!perms.has(e.entityPlayer, "ability.player.useblock")) - { - e.useBlock = Event.Result.DENY; - e.entityPlayer.addChatMessage(new ChatComponentTranslation("ultramine.ability.useblock").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - - if(e.useItem == Event.Result.DENY && e.useBlock == Event.Result.DENY) - e.setCanceled(true); - } - - @SideOnly(Side.SERVER) - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onLivingAttackEvent(LivingAttackEvent e) - { - Entity attacker = e.source.getEntity(); - if(attacker != null && attacker.isEntityPlayerMP()) - { - EntityPlayerMP player = (EntityPlayerMP)attacker; - if(player.playerNetServerHandler == null) - return; - if(!perms.has(player, "ability.player.attack")) - { - e.setCanceled(true); - player.addChatMessage(new ChatComponentTranslation("ultramine.ability.attack").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - } - } - } - - @SideOnly(Side.SERVER) @SubscribeEvent(priority=EventPriority.LOWEST) public void onPlayerLoggedIn(PlayerLoggedInEvent e) { diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang index 736028b..92dd28e 100644 --- a/src/main/resources/assets/ultramine/lang/en_US.lang +++ b/src/main/resources/assets/ultramine/lang/en_US.lang @@ -12,13 +12,6 @@ ultramine.tools.itemblocker.useblock=Use of this block is forbidden by server ultramine.tools.itemblocker.rmitem=This item is forbidden by server -ultramine.ability.blockbreak=You don't have permissions to break blocks -ultramine.ability.blockplace=You don't have permissions to place blocks -ultramine.ability.useitem=You don't have permissions to use items -ultramine.ability.useblock=You don't have permissions to use blocks -ultramine.ability.attack=You don't have permissions to damage entities -ultramine.ability.chat=You don't have permissions to chat - ultramine.notify.loggedhidden=Joined the server in invisibility ultramine.hidden.chat=You can't write to chat in invisibility diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang index 8311f3a..9b696b9 100644 --- a/src/main/resources/assets/ultramine/lang/ru_RU.lang +++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang @@ -12,13 +12,6 @@ ultramine.tools.itemblocker.useblock=Использование данного блока запрещено сервером ultramine.tools.itemblocker.rmitem=Данный предмет запрещен сервером -ultramine.ability.blockbreak=У вас нет прав на разрушение блоков -ultramine.ability.blockplace=У вас нет прав на установку блоков -ultramine.ability.useitem=У вас нет прав на использование предметов -ultramine.ability.useblock=У вас нет прав на использование блоков -ultramine.ability.attack=У вас нет права наносить урон -ultramine.ability.chat=У вас нет прав писать в чате - ultramine.notify.loggedhidden=Присоединился к игре невидимым ultramine.hidden.chat=Вы не можете писать в чат в невидимости