1. Remove marco from dev
2. Add namehistory
3. Fix grammar issues
4. Actually use CoreProtect bridge to rollback players
5.  Improve automatic wiper
This commit is contained in:
Lemon
2017-10-13 23:35:11 +05:00
committed by GitHub
parent 3c09bc7995
commit ed2f15cc54
38 changed files with 1562 additions and 461 deletions

View File

@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.caging;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
import me.totalfreedom.totalfreedommod.command.Command_cage;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import org.bukkit.Location;
import org.bukkit.Material;
@ -187,7 +188,7 @@ public class CageData
block.setType(Material.SKULL);
final Skull skull = (Skull) block.getState();
skull.setSkullType(SkullType.PLAYER);
skull.setOwner("Prozza");
skull.setOwner(Command_cage.playerSkullName);
skull.update();
}
}
@ -195,6 +196,26 @@ public class CageData
}
}
public boolean isCaged()
{
return this.caged;
}
public Location getLocation()
{
return this.location;
}
public Material getOuterMaterial()
{
return this.outerMaterial;
}
public Material getInnerMaterial()
{
return this.innerMaterial;
}
private static class BlockData
{