AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-12 22:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

More progress towards 1.13

Browse Source
This commit is contained in:
ZeroEpoch1969
2018-07-24 19:08:29 -07:00
parent 6275fd8bcb
commit 7170b1c999
29 changed files with 164 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
View File

@ -39,7 +39,6 @@ public class BlockBlocker extends FreedomService
switch (event.getBlockPlaced().getType())
{
case LAVA:
case STATIONARY_LAVA:
{
if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
{
@ -54,7 +53,6 @@ public class BlockBlocker extends FreedomService
break;
}
case WATER:
case STATIONARY_WATER:
{
if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
{

2
src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java
View File

@ -83,7 +83,7 @@ public class InteractBlocker extends FreedomService
break;
}
case EXPLOSIVE_MINECART:
case TNT_MINECART:
{
if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
{

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

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

4
src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java
View File

@ -38,7 +38,7 @@ public class SignBlocker extends FreedomService
{
final Player player = event.getPlayer();
if (event.getBlock().getType().equals(Material.SIGN) || event.getBlock().getType().equals(Material.SIGN_POST) || event.getBlock().getType().equals(Material.WALL_SIGN))
if (event.getBlock().getType().equals(Material.SIGN) || event.getBlock().getType().equals(Material.WALL_SIGN))
{
ItemStack sign = event.getItemInHand();
@ -65,7 +65,7 @@ public class SignBlocker extends FreedomService
return;
}
if (event.getClickedBlock() != null && event.getClickedBlock().getType().equals(Material.SIGN) || event.getClickedBlock().getType().equals(Material.SIGN_POST) || event.getClickedBlock().getType().equals(Material.WALL_SIGN))
if (event.getClickedBlock() != null && event.getClickedBlock().getType().equals(Material.SIGN) || event.getClickedBlock().getType().equals(Material.WALL_SIGN))
{
event.setCancelled(true);
}