AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-04 15:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fishhooks can bypass pvp blocking (#178)

Browse Source 
add fishhook to the list
This commit is contained in:
Deauthorized 2020-01-15 22:44:51 +00:00 committed by Robinson Gallego
parent 7940313dd1
commit 56d5a669cf
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java
View File

@ -7,6 +7,7 @@ import org.bukkit.GameMode;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Trident; import org.bukkit.entity.Trident;
import org.bukkit.entity.FishHook;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -57,6 +58,14 @@ public class PVPBlocker extends FreedomService
player = (Player)trident.getShooter(); player = (Player)trident.getShooter();
} }
} }
else if (event.getDamager() instanceof FishHook)
{
FishHook fishhook = (FishHook)event.getDamager();
if (fishhook.getShooter() instanceof Player)
{
player = (Player)fishhook.getShooter();
}
}
} }
if (player != null & !plugin.al.isAdmin(player)) if (player != null & !plugin.al.isAdmin(player))