Merge branch '1.13' into 2.x_feature_jail_no_teleport

This commit is contained in:
md678685 2018-10-28 18:46:53 +00:00 committed by GitHub
commit 22538ba7c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 21005 additions and 4071 deletions

View file

@ -18,6 +18,7 @@ import net.ess3.nms.refl.ReflUtil;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.inventory.ItemStack;
@ -222,8 +223,8 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
}
@Override
public Boolean canSpawnItem(final int itemId) {
return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
public Boolean canSpawnItem(final Material material) {
return !ess.getSettings().itemSpawnBlacklist().contains(material);
}
@Override