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

Update CoreProtect and masterbuilder restrictions (#100)

Browse Source 
* Update CoreProtect and masterbuilder restrictions

* intellij is gay shit
This commit is contained in:
Telesphoreo
2018-07-26 14:08:48 -07:00
committed by Lemon
parent 655766a0c4
commit 519b456807
10 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
View File

@ -139,7 +139,7 @@ public class ItemFun extends FreedomService
Location location = player.getLocation().clone();
Vector playerPostion = location.toVector().add(new Vector(0.0, 1.65, 0.0));
Vector playerPosition = location.toVector().add(new Vector(0.0, 1.65, 0.0));
Vector playerDirection = location.getDirection().normalize();
double distance = 150.0;
@ -154,7 +154,7 @@ public class ItemFun extends FreedomService
Block lastBlock = null;
for (double offset = 0.0; offset <= distance; offset += (distance / 25.0))
{
Block block = playerPostion.clone().add(playerDirection.clone().multiply(offset)).toLocation(player.getWorld()).getBlock();
Block block = playerPosition.clone().add(playerDirection.clone().multiply(offset)).toLocation(player.getWorld()).getBlock();
if (!block.equals(lastBlock))
{

7
src/main/java/me/totalfreedom/totalfreedommod/fun/MobStacker.java
View File

@ -3,10 +3,10 @@ package me.totalfreedom.totalfreedommod.fun;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class MobStacker extends FreedomService
@ -35,7 +35,7 @@ public class MobStacker extends FreedomService
return;
}
Player attacker = (Player)event.getDamager();
Player attacker = (Player) event.getDamager();
if (!plugin.al.isAdmin(attacker))
{
@ -49,8 +49,5 @@ public class MobStacker extends FreedomService
event.setCancelled(true);
attacker.addPassenger(event.getEntity());
}
}
}

8
src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java
View File

@ -48,10 +48,10 @@ public class Trailer extends FreedomService
return;
}
//if (event.getPlayer().getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
//{
// return;
//}
if (event.getPlayer().getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
{
return;
}
Block fromBlock = event.getFrom().getBlock();
if (!fromBlock.isEmpty())