diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/CheckForPortalTrapTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/CheckForPortalTrapTask.java index 66ca855..530656d 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/CheckForPortalTrapTask.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/CheckForPortalTrapTask.java @@ -48,7 +48,7 @@ class CheckForPortalTrapTask extends BukkitRunnable { if (player.isOnline() && player.getPortalCooldown() >= 10 && player.hasMetadata("GP_PORTALRESCUE")) { - instance.AddLogEntry("Rescued " + player.getName() + " from a nether portal.\nTeleported from " + player.getLocation().toString() + " to " + returnLocation.toString(), CustomLogEntryTypes.Debug); + GriefPrevention.AddLogEntry("Rescued " + player.getName() + " from a nether portal.\nTeleported from " + player.getLocation().toString() + " to " + returnLocation.toString(), CustomLogEntryTypes.Debug); player.teleport(returnLocation); player.removeMetadata("GP_PORTALRESCUE", instance); } diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 38073da..f6d0b64 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -1408,7 +1408,7 @@ public class EntityEventHandler implements Listener if (thrower == null || claim.allowContainers(thrower) != null) { event.setIntensity(effected, 0); - instance.sendMessage(thrower, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); + GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); return; } } diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 433ffa9..5c98736 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -178,7 +178,7 @@ class PlayerEventHandler implements Listener recipients.clear(); recipients.addAll(recipientsToKeep); - instance.AddLogEntry(notificationMessage, CustomLogEntryTypes.MutedChat, false); + GriefPrevention.AddLogEntry(notificationMessage, CustomLogEntryTypes.MutedChat, false); } //troll and excessive profanity filter @@ -199,13 +199,13 @@ class PlayerEventHandler implements Listener recipients.add(player); //if player not new warn for the first infraction per play session. - if (!instance.isNewToServer(player)) + if (!GriefPrevention.isNewToServer(player)) { PlayerData playerData = instance.dataStore.getPlayerData(player.getUniqueId()); if (!playerData.profanityWarned) { playerData.profanityWarned = true; - instance.sendMessage(player, TextMode.Err, Messages.NoProfanity); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoProfanity); event.setCancelled(true); return; } @@ -214,8 +214,8 @@ class PlayerEventHandler implements Listener //otherwise assume chat troll and mute all chat from this sender until an admin says otherwise else if (instance.config_trollFilterEnabled) { - instance.AddLogEntry("Auto-muted new player " + player.getName() + " for profanity shortly after join. Use /SoftMute to undo.", CustomLogEntryTypes.AdminActivity); - instance.AddLogEntry(notificationMessage, CustomLogEntryTypes.MutedChat, false); + GriefPrevention.AddLogEntry("Auto-muted new player " + player.getName() + " for profanity shortly after join. Use /SoftMute to undo.", CustomLogEntryTypes.AdminActivity); + GriefPrevention.AddLogEntry(notificationMessage, CustomLogEntryTypes.MutedChat, false); instance.dataStore.toggleSoftMute(player.getUniqueId()); } } @@ -269,11 +269,11 @@ class PlayerEventHandler implements Listener { if (instance.creativeRulesApply(player.getLocation())) { - instance.sendMessage(player, TextMode.Info, Messages.CreativeBasicsVideo2, 10L, DataStore.CREATIVE_VIDEO_URL); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.CreativeBasicsVideo2, 10L, DataStore.CREATIVE_VIDEO_URL); } else { - instance.sendMessage(player, TextMode.Info, Messages.SurvivalBasicsVideo2, 10L, DataStore.SURVIVAL_VIDEO_URL); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.SurvivalBasicsVideo2, 10L, DataStore.SURVIVAL_VIDEO_URL); } } @@ -291,7 +291,7 @@ class PlayerEventHandler implements Listener if (!message.contains("/trapped") && message.contains(checkWord)) { - instance.sendMessage( + GriefPrevention.sendMessage( player, TextMode.Info, Messages.TrappedInstructions, @@ -326,7 +326,7 @@ class PlayerEventHandler implements Listener if (currentLocation.getBlockX() == playerData.noChatLocation.getBlockX() && currentLocation.getBlockZ() == playerData.noChatLocation.getBlockZ()) { - instance.sendMessage(player, TextMode.Err, Messages.NoChatUntilMove, 10L); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoChatUntilMove, 10L); result.muteReason = "pre-movement chat"; } else @@ -351,7 +351,7 @@ class PlayerEventHandler implements Listener if (instance.config_spam_banOffenders) { //log entry - instance.AddLogEntry("Banning " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity); + GriefPrevention.AddLogEntry("Banning " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity); //kick and ban PlayerKickBanTask task = new PlayerKickBanTask(player, instance.config_spam_banMessage, "GriefPrevention Anti-Spam", true); @@ -360,7 +360,7 @@ class PlayerEventHandler implements Listener else { //log entry - instance.AddLogEntry("Kicking " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity); + GriefPrevention.AddLogEntry("Kicking " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity); //just kick PlayerKickBanTask task = new PlayerKickBanTask(player, "", "GriefPrevention Anti-Spam", false); @@ -370,15 +370,15 @@ class PlayerEventHandler implements Listener else if (result.shouldWarnChatter) { //warn and log - instance.sendMessage(player, TextMode.Warn, instance.config_spam_warningMessage, 10L); - instance.AddLogEntry("Warned " + player.getName() + " about spam penalties.", CustomLogEntryTypes.Debug, true); + GriefPrevention.sendMessage(player, TextMode.Warn, instance.config_spam_warningMessage, 10L); + GriefPrevention.AddLogEntry("Warned " + player.getName() + " about spam penalties.", CustomLogEntryTypes.Debug, true); } if (result.muteReason != null) { //mute and log - instance.AddLogEntry("Muted " + result.muteReason + "."); - instance.AddLogEntry("Muted " + player.getName() + " " + result.muteReason + ":" + message, CustomLogEntryTypes.Debug, true); + GriefPrevention.AddLogEntry("Muted " + result.muteReason + "."); + GriefPrevention.AddLogEntry("Muted " + player.getName() + " " + result.muteReason + ":" + message, CustomLogEntryTypes.Debug, true); return true; } @@ -450,7 +450,7 @@ class PlayerEventHandler implements Listener if (playerData.ignoredPlayers.containsKey(targetPlayer.getUniqueId()) && !targetPlayer.hasPermission("griefprevention.notignorable")) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, Messages.IsIgnoringYou); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.IsIgnoringYou); return; } @@ -458,7 +458,7 @@ class PlayerEventHandler implements Listener if (targetPlayerData.ignoredPlayers.containsKey(player.getUniqueId()) && !player.hasPermission("griefprevention.notignorable")) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, Messages.IsIgnoringYou); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.IsIgnoringYou); return; } } @@ -470,7 +470,7 @@ class PlayerEventHandler implements Listener if ((playerData.inPvpCombat() || playerData.siegeData != null) && instance.config_pvp_blockedCommands.contains(command)) { event.setCancelled(true); - instance.sendMessage(event.getPlayer(), TextMode.Err, Messages.CommandBannedInPvP); + GriefPrevention.sendMessage(event.getPlayer(), TextMode.Err, Messages.CommandBannedInPvP); return; } @@ -530,7 +530,7 @@ class PlayerEventHandler implements Listener String reason = claim.allowAccess(player); if (reason != null) { - instance.sendMessage(player, TextMode.Err, reason); + GriefPrevention.sendMessage(player, TextMode.Err, reason); event.setCancelled(true); } } @@ -683,7 +683,7 @@ class PlayerEventHandler implements Listener this.lastLoginThisServerSessionMap.put(playerID, nowDate); //if newish, prevent chat until he's moved a bit to prove he's not a bot - if (instance.isNewToServer(player)) + if (GriefPrevention.isNewToServer(player)) { playerData.noChatLocation = player.getLocation(); } @@ -747,7 +747,7 @@ class PlayerEventHandler implements Listener //otherwise if that account is still banned, ban this account, too else { - instance.AddLogEntry("Auto-banned new player " + player.getName() + " because that account is using an IP address very recently used by banned player " + info.bannedAccountName + " (" + info.address.toString() + ").", CustomLogEntryTypes.AdminActivity); + GriefPrevention.AddLogEntry("Auto-banned new player " + player.getName() + " because that account is using an IP address very recently used by banned player " + info.bannedAccountName + " (" + info.address.toString() + ").", CustomLogEntryTypes.AdminActivity); //notify any online ops @SuppressWarnings("unchecked") @@ -756,7 +756,7 @@ class PlayerEventHandler implements Listener { if (otherPlayer.isOp()) { - instance.sendMessage(otherPlayer, TextMode.Success, Messages.AutoBanNotify, player.getName(), info.bannedAccountName); + GriefPrevention.sendMessage(otherPlayer, TextMode.Success, Messages.AutoBanNotify, player.getName(), info.bannedAccountName); } } @@ -774,14 +774,14 @@ class PlayerEventHandler implements Listener } //in case player has changed his name, on successful login, update UUID > Name mapping - instance.cacheUUIDNamePair(player.getUniqueId(), player.getName()); + GriefPrevention.cacheUUIDNamePair(player.getUniqueId(), player.getName()); //ensure we're not over the limit for this IP address InetAddress ipAddress = playerData.ipAddress; if (ipAddress != null) { int ipLimit = instance.config_ipLimit; - if (ipLimit > 0 && instance.isNewToServer(player)) + if (ipLimit > 0 && GriefPrevention.isNewToServer(player)) { int ipCount = 0; @@ -792,7 +792,7 @@ class PlayerEventHandler implements Listener if (onlinePlayer.getUniqueId().equals(player.getUniqueId())) continue; PlayerData otherData = instance.dataStore.getPlayerData(onlinePlayer.getUniqueId()); - if (ipAddress.equals(otherData.ipAddress) && instance.isNewToServer(onlinePlayer)) + if (ipAddress.equals(otherData.ipAddress) && GriefPrevention.isNewToServer(onlinePlayer)) { ipCount++; } @@ -818,7 +818,7 @@ class PlayerEventHandler implements Listener if (player.hasMetadata("GP_PORTALRESCUE")) { //If so, let him know and rescue him in 10 seconds. If he is in fact not trapped, hopefully chunks will have loaded by this time so he can walk out. - instance.sendMessage(player, TextMode.Info, Messages.NetherPortalTrapDetectionMessage, 20L); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.NetherPortalTrapDetectionMessage, 20L); new BukkitRunnable() { @Override @@ -826,7 +826,7 @@ class PlayerEventHandler implements Listener { if (player.getPortalCooldown() > 8 && player.hasMetadata("GP_PORTALRESCUE")) { - instance.AddLogEntry("Rescued " + player.getName() + " from a nether portal.\nTeleported from " + player.getLocation().toString() + " to " + ((Location) player.getMetadata("GP_PORTALRESCUE").get(0).value()).toString(), CustomLogEntryTypes.Debug); + GriefPrevention.AddLogEntry("Rescued " + player.getName() + " from a nether portal.\nTeleported from " + player.getLocation().toString() + " to " + ((Location) player.getMetadata("GP_PORTALRESCUE").get(0).value()).toString(), CustomLogEntryTypes.Debug); player.teleport((Location) player.getMetadata("GP_PORTALRESCUE").get(0).value()); player.removeMetadata("GP_PORTALRESCUE", instance); } @@ -867,7 +867,7 @@ class PlayerEventHandler implements Listener //also send him any messaged from grief prevention he would have received while dead if (playerData.messageOnRespawn != null) { - instance.sendMessage(player, ChatColor.RESET /*color is alrady embedded in message in this case*/, playerData.messageOnRespawn, 40L); + GriefPrevention.sendMessage(player, ChatColor.RESET /*color is alrady embedded in message in this case*/, playerData.messageOnRespawn, 40L); playerData.messageOnRespawn = null; } @@ -1043,14 +1043,14 @@ class PlayerEventHandler implements Listener //if in combat, don't let him drop it if (!instance.config_pvp_allowCombatItemDrop && playerData.inPvpCombat()) { - instance.sendMessage(player, TextMode.Err, Messages.PvPNoDrop); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.PvPNoDrop); event.setCancelled(true); } //if he's under siege, don't let him drop it else if (playerData.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.SiegeNoDrop); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeNoDrop); event.setCancelled(true); } } @@ -1091,7 +1091,7 @@ class PlayerEventHandler implements Listener String noAccessReason = toClaim.allowAccess(player); if (noAccessReason != null) { - instance.sendMessage(player, TextMode.Err, noAccessReason); + GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason); event.setCancelled(true); if (cause == TeleportCause.ENDER_PEARL) player.getInventory().addItem(new ItemStack(Material.ENDER_PEARL)); @@ -1114,7 +1114,7 @@ class PlayerEventHandler implements Listener Claim sourceClaim = this.dataStore.getClaimAt(source, false, playerData.lastClaim); if (sourceClaim != null && sourceClaim.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.SiegeNoTeleport); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeNoTeleport); event.setCancelled(true); return; } @@ -1123,7 +1123,7 @@ class PlayerEventHandler implements Listener Claim destinationClaim = this.dataStore.getClaimAt(destination, false, null); if (destinationClaim != null && destinationClaim.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.BesiegedNoTeleport); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.BesiegedNoTeleport); event.setCancelled(true); return; } @@ -1196,7 +1196,7 @@ class PlayerEventHandler implements Listener { tameable.setOwner(playerData.petGiveawayRecipient); playerData.petGiveawayRecipient = null; - instance.sendMessage(player, TextMode.Success, Messages.PetGiveawayConfirmation); + GriefPrevention.sendMessage(player, TextMode.Success, Messages.PetGiveawayConfirmation); event.setCancelled(true); } @@ -1211,7 +1211,7 @@ class PlayerEventHandler implements Listener String message = instance.dataStore.getMessage(Messages.NotYourPet, ownerName); if (player.hasPermission("griefprevention.ignoreclaims")) message += " " + instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); - instance.sendMessage(player, TextMode.Err, message); + GriefPrevention.sendMessage(player, TextMode.Err, message); event.setCancelled(true); return; } @@ -1235,7 +1235,7 @@ class PlayerEventHandler implements Listener String noBuildReason = instance.allowBuild(player, entity.getLocation(), Material.ITEM_FRAME); if (noBuildReason != null) { - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); event.setCancelled(true); return; } @@ -1251,7 +1251,7 @@ class PlayerEventHandler implements Listener String noEntitiesReason = claim.allowMoreEntities(false); if (noEntitiesReason != null) { - instance.sendMessage(player, TextMode.Err, noEntitiesReason); + GriefPrevention.sendMessage(player, TextMode.Err, noEntitiesReason); event.setCancelled(true); return; } @@ -1265,14 +1265,14 @@ class PlayerEventHandler implements Listener { if (playerData.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.SiegeNoContainers); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeNoContainers); event.setCancelled(true); return; } if (playerData.inPvpCombat()) { - instance.sendMessage(player, TextMode.Err, Messages.PvPNoContainers); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.PvPNoContainers); event.setCancelled(true); return; } @@ -1291,7 +1291,7 @@ class PlayerEventHandler implements Listener String noContainersReason = claim.allowContainers(player); if (noContainersReason != null) { - instance.sendMessage(player, TextMode.Err, noContainersReason); + GriefPrevention.sendMessage(player, TextMode.Err, noContainersReason); event.setCancelled(true); return; } @@ -1311,7 +1311,7 @@ class PlayerEventHandler implements Listener String message = instance.dataStore.getMessage(Messages.NoDamageClaimedEntity, claim.getOwnerName()); if (player.hasPermission("griefprevention.ignoreclaims")) message += " " + instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); - instance.sendMessage(player, TextMode.Err, message); + GriefPrevention.sendMessage(player, TextMode.Err, message); event.setCancelled(true); return; } @@ -1328,7 +1328,7 @@ class PlayerEventHandler implements Listener if (failureReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, failureReason); + GriefPrevention.sendMessage(player, TextMode.Err, failureReason); return; } } @@ -1355,7 +1355,7 @@ class PlayerEventHandler implements Listener if (errorMessage != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName()); return; } } @@ -1379,7 +1379,7 @@ class PlayerEventHandler implements Listener //has that player unlocked his drops? OfflinePlayer owner = instance.getServer().getOfflinePlayer(ownerID); - String ownerName = instance.lookupPlayerName(ownerID); + String ownerName = GriefPrevention.lookupPlayerName(ownerID); if (owner.isOnline() && !player.equals(owner)) { PlayerData playerData = this.dataStore.getPlayerData(ownerID); @@ -1392,8 +1392,8 @@ class PlayerEventHandler implements Listener //if hasn't been instructed how to unlock, send explanatory messages if (!playerData.receivedDropUnlockAdvertisement) { - instance.sendMessage(owner.getPlayer(), TextMode.Instr, Messages.DropUnlockAdvertisement); - instance.sendMessage(player, TextMode.Err, Messages.PickupBlockedExplanation, ownerName); + GriefPrevention.sendMessage(owner.getPlayer(), TextMode.Instr, Messages.DropUnlockAdvertisement); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.PickupBlockedExplanation, ownerName); playerData.receivedDropUnlockAdvertisement = true; } @@ -1423,7 +1423,7 @@ class PlayerEventHandler implements Listener //otherwise take away his immunity. he may be armed now. at least, he's worth killing for some loot playerData.pvpImmune = false; - instance.sendMessage(player, TextMode.Warn, Messages.PvPImmunityEnd); + GriefPrevention.sendMessage(player, TextMode.Warn, Messages.PvPImmunityEnd); } } } @@ -1465,7 +1465,7 @@ class PlayerEventHandler implements Listener String noBuildReason = instance.allowBuild(player, block.getLocation(), Material.WATER); if (noBuildReason != null) { - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); bucketEvent.setCancelled(true); return; } @@ -1485,7 +1485,7 @@ class PlayerEventHandler implements Listener { if (bucketEvent.getBucket() == Material.LAVA_BUCKET) { - instance.sendMessage(player, TextMode.Err, Messages.NoWildernessBuckets); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoWildernessBuckets); bucketEvent.setCancelled(true); return; } @@ -1503,7 +1503,7 @@ class PlayerEventHandler implements Listener Location location = otherPlayer.getLocation(); if (!otherPlayer.equals(player) && otherPlayer.getGameMode() == GameMode.SURVIVAL && player.canSee(otherPlayer) && block.getY() >= location.getBlockY() - 1 && location.distanceSquared(block.getLocation()) < minLavaDistance * minLavaDistance) { - instance.sendMessage(player, TextMode.Err, Messages.NoLavaNearOtherPlayer, "another player"); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoLavaNearOtherPlayer, "another player"); bucketEvent.setCancelled(true); return; } @@ -1535,7 +1535,7 @@ class PlayerEventHandler implements Listener if (makeLogEntry) { - instance.AddLogEntry(player.getName() + " placed suspicious " + bucketEvent.getBucket().name() + " @ " + instance.getfriendlyLocationString(block.getLocation()), CustomLogEntryTypes.SuspiciousActivity, true); + GriefPrevention.AddLogEntry(player.getName() + " placed suspicious " + bucketEvent.getBucket().name() + " @ " + GriefPrevention.getfriendlyLocationString(block.getLocation()), CustomLogEntryTypes.SuspiciousActivity, true); } } } @@ -1576,7 +1576,7 @@ class PlayerEventHandler implements Listener return; } - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); bucketEvent.setCancelled(true); return; } @@ -1645,7 +1645,7 @@ class PlayerEventHandler implements Listener if (noBuildReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); player.sendBlockChange(adjacentBlock.getLocation(), adjacentBlock.getType(), adjacentBlock.getData()); return; } @@ -1687,7 +1687,7 @@ class PlayerEventHandler implements Listener //block container use while under siege, so players can't hide items from attackers if (playerData.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.SiegeNoContainers); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeNoContainers); event.setCancelled(true); return; } @@ -1695,7 +1695,7 @@ class PlayerEventHandler implements Listener //block container use during pvp combat, same reason if (playerData.inPvpCombat()) { - instance.sendMessage(player, TextMode.Err, Messages.PvPNoContainers); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.PvPNoContainers); event.setCancelled(true); return; } @@ -1710,7 +1710,7 @@ class PlayerEventHandler implements Listener if (noContainersReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noContainersReason); + GriefPrevention.sendMessage(player, TextMode.Err, noContainersReason); return; } } @@ -1720,7 +1720,7 @@ class PlayerEventHandler implements Listener if (playerData.pvpImmune) { playerData.pvpImmune = false; - instance.sendMessage(player, TextMode.Warn, Messages.PvPImmunityEnd); + GriefPrevention.sendMessage(player, TextMode.Warn, Messages.PvPImmunityEnd); } } @@ -1747,7 +1747,7 @@ class PlayerEventHandler implements Listener if (noAccessReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noAccessReason); + GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason); return; } } @@ -1766,7 +1766,7 @@ class PlayerEventHandler implements Listener if (noAccessReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noAccessReason); + GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason); return; } } @@ -1785,7 +1785,7 @@ class PlayerEventHandler implements Listener if (noContainerReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noContainerReason); + GriefPrevention.sendMessage(player, TextMode.Err, noContainerReason); return; } } @@ -1811,7 +1811,7 @@ class PlayerEventHandler implements Listener if (noBuildReason != null) { event.setCancelled(true); - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); return; } } @@ -1855,7 +1855,7 @@ class PlayerEventHandler implements Listener clickedBlockType); if (noBuildReason != null) { - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); event.setCancelled(true); } @@ -1870,7 +1870,7 @@ class PlayerEventHandler implements Listener String reason = claim.allowContainers(player); if (reason != null) { - instance.sendMessage(player, TextMode.Err, reason); + GriefPrevention.sendMessage(player, TextMode.Err, reason); event.setCancelled(true); } } @@ -1894,7 +1894,7 @@ class PlayerEventHandler implements Listener String reason = claim.allowContainers(player); if (reason != null) { - instance.sendMessage(player, TextMode.Err, reason); + GriefPrevention.sendMessage(player, TextMode.Err, reason); event.setCancelled(true); } } @@ -1923,7 +1923,7 @@ class PlayerEventHandler implements Listener String noBuildReason = instance.allowBuild(player, clickedBlock.getLocation(), Material.MINECART); if (noBuildReason != null) { - instance.sendMessage(player, TextMode.Err, noBuildReason); + GriefPrevention.sendMessage(player, TextMode.Err, noBuildReason); event.setCancelled(true); return; } @@ -1936,7 +1936,7 @@ class PlayerEventHandler implements Listener String noEntitiesReason = claim.allowMoreEntities(false); if (noEntitiesReason != null) { - instance.sendMessage(player, TextMode.Err, noEntitiesReason); + GriefPrevention.sendMessage(player, TextMode.Err, noEntitiesReason); event.setCancelled(true); return; } @@ -1969,7 +1969,7 @@ class PlayerEventHandler implements Listener Visualization.Apply(player, visualization); - instance.sendMessage(player, TextMode.Info, Messages.ShowNearbyClaims, String.valueOf(claims.size())); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.ShowNearbyClaims, String.valueOf(claims.size())); return; } @@ -1991,7 +1991,7 @@ class PlayerEventHandler implements Listener //air indicates too far away if (clickedBlockType == Material.AIR) { - instance.sendMessage(player, TextMode.Err, Messages.TooFarAway); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.TooFarAway); // alert plugins of a visualization Bukkit.getPluginManager().callEvent(new VisualizationEvent(player, null, Collections.emptySet())); @@ -2011,7 +2011,7 @@ class PlayerEventHandler implements Listener Bukkit.getPluginManager().callEvent(inspectionEvent); if (inspectionEvent.isCancelled()) return; - instance.sendMessage(player, TextMode.Info, Messages.BlockNotClaimed); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.BlockNotClaimed); // alert plugins of a visualization Bukkit.getPluginManager().callEvent(new VisualizationEvent(player, null, Collections.emptySet())); @@ -2028,7 +2028,7 @@ class PlayerEventHandler implements Listener if (inspectionEvent.isCancelled()) return; playerData.lastClaim = claim; - instance.sendMessage(player, TextMode.Info, Messages.BlockClaimed, claim.getOwnerName()); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.BlockClaimed, claim.getOwnerName()); //visualize boundary Visualization visualization = Visualization.FromClaim(claim, player.getEyeLocation().getBlockY(), VisualizationType.Claim, player.getLocation()); @@ -2040,7 +2040,7 @@ class PlayerEventHandler implements Listener if (player.hasPermission("griefprevention.seeclaimsize")) { - instance.sendMessage(player, TextMode.Info, " " + claim.getWidth() + "x" + claim.getHeight() + "=" + claim.getArea()); + GriefPrevention.sendMessage(player, TextMode.Info, " " + claim.getWidth() + "x" + claim.getHeight() + "=" + claim.getArea()); } //if permission, tell about the player's offline time @@ -2054,7 +2054,7 @@ class PlayerEventHandler implements Listener Date now = new Date(); long daysElapsed = (now.getTime() - lastLogin.getTime()) / (1000 * 60 * 60 * 24); - instance.sendMessage(player, TextMode.Info, Messages.PlayerOfflineTime, String.valueOf(daysElapsed)); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.PlayerOfflineTime, String.valueOf(daysElapsed)); //drop the data we just loaded, if the player isn't online if (instance.getServer().getPlayer(claim.ownerID) == null) @@ -2074,7 +2074,7 @@ class PlayerEventHandler implements Listener if (playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId()); if (playerData.siegeData != null) { - instance.sendMessage(player, TextMode.Err, Messages.SiegeNoShovel); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.SiegeNoShovel); event.setCancelled(true); return; } @@ -2096,7 +2096,7 @@ class PlayerEventHandler implements Listener //can't use the shovel from too far away if (clickedBlockType == Material.AIR) { - instance.sendMessage(player, TextMode.Err, Messages.TooFarAway); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.TooFarAway); return; } @@ -2109,7 +2109,7 @@ class PlayerEventHandler implements Listener Claim claim = this.dataStore.getClaimAt(clickedBlock.getLocation(), false, playerData.lastClaim); if (claim != null) { - instance.sendMessage(player, TextMode.Err, Messages.BlockClaimed, claim.getOwnerName()); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.BlockClaimed, claim.getOwnerName()); Visualization visualization = Visualization.FromClaim(claim, clickedBlock.getY(), VisualizationType.ErrorClaim, player.getLocation()); // alert plugins of a visualization @@ -2271,7 +2271,7 @@ class PlayerEventHandler implements Listener //if the player doesn't have claims permission, don't do anything if (!player.hasPermission("griefprevention.createclaims")) { - instance.sendMessage(player, TextMode.Err, Messages.NoCreateClaimPermission); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoCreateClaimPermission); return; } @@ -2341,7 +2341,7 @@ class PlayerEventHandler implements Listener { playerData.claimResizing = claim; playerData.lastShovelLocation = clickedBlock.getLocation(); - instance.sendMessage(player, TextMode.Instr, Messages.ResizeStart); + GriefPrevention.sendMessage(player, TextMode.Instr, Messages.ResizeStart); } //if he didn't click on a corner and is in subdivision mode, he's creating a new subdivision @@ -2353,13 +2353,13 @@ class PlayerEventHandler implements Listener //if the clicked claim was a subdivision, tell him he can't start a new subdivision here if (claim.parent != null) { - instance.sendMessage(player, TextMode.Err, Messages.ResizeFailOverlapSubdivision); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.ResizeFailOverlapSubdivision); } //otherwise start a new subdivision else { - instance.sendMessage(player, TextMode.Instr, Messages.SubdivisionStart); + GriefPrevention.sendMessage(player, TextMode.Instr, Messages.SubdivisionStart); playerData.lastShovelLocation = clickedBlock.getLocation(); playerData.claimSubdividing = claim; } @@ -2389,7 +2389,7 @@ class PlayerEventHandler implements Listener //if it didn't succeed, tell the player why if (!result.succeeded) { - instance.sendMessage(player, TextMode.Err, Messages.CreateSubdivisionOverlap); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateSubdivisionOverlap); Visualization visualization = Visualization.FromClaim(result.claim, clickedBlock.getY(), VisualizationType.ErrorClaim, player.getLocation()); @@ -2404,7 +2404,7 @@ class PlayerEventHandler implements Listener //otherwise, advise him on the /trust command and show him his new subdivision else { - instance.sendMessage(player, TextMode.Success, Messages.SubdivisionSuccess); + GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubdivisionSuccess); Visualization visualization = Visualization.FromClaim(result.claim, clickedBlock.getY(), VisualizationType.Claim, player.getLocation()); // alert plugins of a visualization @@ -2421,7 +2421,7 @@ class PlayerEventHandler implements Listener //also advise him to consider /abandonclaim or resizing the existing claim else { - instance.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlap); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlap); Visualization visualization = Visualization.FromClaim(claim, clickedBlock.getY(), VisualizationType.Claim, player.getLocation()); // alert plugins of a visualization @@ -2434,7 +2434,7 @@ class PlayerEventHandler implements Listener //otherwise tell the player he can't claim here because it's someone else's claim, and show him the claim else { - instance.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapOtherPlayer, claim.getOwnerName()); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapOtherPlayer, claim.getOwnerName()); Visualization visualization = Visualization.FromClaim(claim, clickedBlock.getY(), VisualizationType.ErrorClaim, player.getLocation()); // alert plugins of a visualization @@ -2455,7 +2455,7 @@ class PlayerEventHandler implements Listener //if claims are not enabled in this world and it's not an administrative claim, display an error message and stop if (!instance.claimsEnabledForWorld(player.getWorld())) { - instance.sendMessage(player, TextMode.Err, Messages.ClaimsDisabledWorld); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.ClaimsDisabledWorld); return; } @@ -2464,13 +2464,13 @@ class PlayerEventHandler implements Listener !player.hasPermission("griefprevention.overrideclaimcountlimit") && playerData.getClaims().size() >= instance.config_claims_maxClaimsPerPlayer) { - instance.sendMessage(player, TextMode.Err, Messages.ClaimCreationFailedOverClaimCountLimit); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.ClaimCreationFailedOverClaimCountLimit); return; } //remember it, and start him on the new claim playerData.lastShovelLocation = clickedBlock.getLocation(); - instance.sendMessage(player, TextMode.Instr, Messages.ClaimStart); + GriefPrevention.sendMessage(player, TextMode.Instr, Messages.ClaimStart); //show him where he's working Claim newClaim = new Claim(clickedBlock.getLocation(), clickedBlock.getLocation(), null, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), null); @@ -2496,7 +2496,7 @@ class PlayerEventHandler implements Listener //apply pvp rule if (playerData.inPvpCombat()) { - instance.sendMessage(player, TextMode.Err, Messages.NoClaimDuringPvP); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoClaimDuringPvP); return; } @@ -2511,7 +2511,7 @@ class PlayerEventHandler implements Listener //this IF block is a workaround for craftbukkit bug which fires two events for one interaction if (newClaimWidth != 1 && newClaimHeight != 1) { - instance.sendMessage(player, TextMode.Err, Messages.NewClaimTooNarrow, String.valueOf(instance.config_claims_minWidth)); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.NewClaimTooNarrow, String.valueOf(instance.config_claims_minWidth)); } return; } @@ -2521,7 +2521,7 @@ class PlayerEventHandler implements Listener { if (newArea != 1) { - instance.sendMessage(player, TextMode.Err, Messages.ResizeClaimInsufficientArea, String.valueOf(instance.config_claims_minArea)); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.ResizeClaimInsufficientArea, String.valueOf(instance.config_claims_minArea)); } return; @@ -2535,7 +2535,7 @@ class PlayerEventHandler implements Listener int remainingBlocks = playerData.getRemainingClaimBlocks(); if (newClaimArea > remainingBlocks) { - instance.sendMessage(player, TextMode.Err, Messages.CreateClaimInsufficientBlocks, String.valueOf(newClaimArea - remainingBlocks)); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateClaimInsufficientBlocks, String.valueOf(newClaimArea - remainingBlocks)); instance.dataStore.tryAdvertiseAdminAlternatives(player); return; } @@ -2560,7 +2560,7 @@ class PlayerEventHandler implements Listener { if (result.claim != null) { - instance.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapShort); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapShort); Visualization visualization = Visualization.FromClaim(result.claim, clickedBlock.getY(), VisualizationType.ErrorClaim, player.getLocation()); @@ -2571,7 +2571,7 @@ class PlayerEventHandler implements Listener } else { - instance.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapRegion); + GriefPrevention.sendMessage(player, TextMode.Err, Messages.CreateClaimFailOverlapRegion); } return; @@ -2580,7 +2580,7 @@ class PlayerEventHandler implements Listener //otherwise, advise him on the /trust command and show him his new claim else { - instance.sendMessage(player, TextMode.Success, Messages.CreateClaimSuccess); + GriefPrevention.sendMessage(player, TextMode.Success, Messages.CreateClaimSuccess); Visualization visualization = Visualization.FromClaim(result.claim, clickedBlock.getY(), VisualizationType.Claim, player.getLocation()); // alert plugins of a visualization @@ -2592,8 +2592,8 @@ class PlayerEventHandler implements Listener //if it's a big claim, tell the player about subdivisions if (!player.hasPermission("griefprevention.adminclaims") && result.claim.getArea() >= 1000) { - instance.sendMessage(player, TextMode.Info, Messages.BecomeMayor, 200L); - instance.sendMessage(player, TextMode.Instr, Messages.SubdivisionVideo2, 201L, DataStore.SUBDIVISION_VIDEO_URL); + GriefPrevention.sendMessage(player, TextMode.Info, Messages.BecomeMayor, 200L); + GriefPrevention.sendMessage(player, TextMode.Instr, Messages.SubdivisionVideo2, 201L, DataStore.SUBDIVISION_VIDEO_URL); } instance.autoExtendClaim(result.claim);