Misc code fixes

This commit is contained in:
nossr50
2020-07-13 11:39:03 -07:00
parent 428c093ae4
commit 7eae59a0b3
153 changed files with 1139 additions and 1474 deletions

View File

@ -7,8 +7,8 @@ import org.bukkit.plugin.Plugin;
public abstract class McMMOChatEvent extends Event implements Cancellable {
private boolean cancelled;
private Plugin plugin;
private String sender;
private final Plugin plugin;
private final String sender;
private String displayName;
private String message;

View File

@ -6,7 +6,7 @@ import org.bukkit.plugin.Plugin;
* Called when a chat is sent to a party channel
*/
public class McMMOPartyChatEvent extends McMMOChatEvent {
private String party;
private final String party;
public McMMOPartyChatEvent(Plugin plugin, String sender, String displayName, String party, String message) {
super(plugin, sender, displayName, message);

View File

@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import java.util.HashMap;
public class McMMOPlayerVampirismEvent extends McMMOPlayerDeathPenaltyEvent {
private boolean isVictim;
private final boolean isVictim;
public McMMOPlayerVampirismEvent(Player player, boolean isVictim, HashMap<String, Integer> levelChanged, HashMap<String, Float> experienceChanged) {
super(player, levelChanged, experienceChanged);

View File

@ -6,9 +6,9 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
public class McMMOPartyAllianceChangeEvent extends PlayerEvent implements Cancellable {
private String oldAlly;
private String newAlly;
private EventReason reason;
private final String oldAlly;
private final String newAlly;
private final EventReason reason;
private boolean cancelled;
public McMMOPartyAllianceChangeEvent(Player player, String oldAlly, String newAlly, EventReason reason) {
@ -62,7 +62,7 @@ public class McMMOPartyAllianceChangeEvent extends PlayerEvent implements Cancel
/**
* Any reason that doesn't fit elsewhere.
*/
CUSTOM;
CUSTOM
}
/** Following are required for Cancellable **/

View File

@ -9,9 +9,9 @@ import org.bukkit.event.player.PlayerEvent;
* Called when a player attempts to join, leave, or change parties.
*/
public class McMMOPartyChangeEvent extends PlayerEvent implements Cancellable {
private String oldParty;
private String newParty;
private EventReason reason;
private final String oldParty;
private final String newParty;
private final EventReason reason;
private boolean cancelled;
public McMMOPartyChangeEvent(Player player, String oldParty, String newParty, EventReason reason) {
@ -75,7 +75,7 @@ public class McMMOPartyChangeEvent extends PlayerEvent implements Cancellable {
/**
* Any reason that doesn't fit elsewhere.
*/
CUSTOM;
CUSTOM
}
/** Following are required for Cancellable **/

View File

@ -6,7 +6,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
public class McMMOPartyLevelUpEvent extends Event implements Cancellable {
private Party party;
private final Party party;
private int levelsChanged;
private boolean cancelled;

View File

@ -8,8 +8,8 @@ import org.bukkit.event.player.PlayerTeleportEvent;
* Called just before a player teleports using the /ptp command.
*/
public class McMMOPartyTeleportEvent extends PlayerTeleportEvent {
private String party;
private Player target;
private final String party;
private final Player target;
public McMMOPartyTeleportEvent(Player player, Player target, String party) {
super(player, player.getLocation(), target.getLocation(), TeleportCause.COMMAND);

View File

@ -6,7 +6,7 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
public class McMMOPartyXpGainEvent extends Event implements Cancellable {
private Party party;
private final Party party;
private float xpGained;
private boolean cancelled;

View File

@ -9,8 +9,8 @@ import org.bukkit.event.HandlerList;
public class McMMOPlayerProfileLoadEvent extends Event implements Cancellable {
private boolean cancelled;
private PlayerProfile profile;
private Player player;
private final PlayerProfile profile;
private final Player player;
public McMMOPlayerProfileLoadEvent(Player player, PlayerProfile profile){
super(!Bukkit.isPrimaryThread());

View File

@ -6,7 +6,7 @@ import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
import org.bukkit.entity.Player;
public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent {
private SuperAbilityType ability;
private final SuperAbilityType ability;
protected McMMOPlayerAbilityEvent(Player player, PrimarySkillType skill) {
super(player, skill);

View File

@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
public class McMMOPlayerBrewEvent extends McMMOPlayerSkillEvent implements Cancellable {
private BlockState brewingStand;
private final BlockState brewingStand;
private boolean cancelled;

View File

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
import java.util.Map;
public class McMMOPlayerMagicHunterEvent extends McMMOPlayerFishingTreasureEvent {
private Map<Enchantment, Integer> enchants;
private final Map<Enchantment, Integer> enchants;
public McMMOPlayerMagicHunterEvent(Player player, ItemStack treasure, int xp, Map<Enchantment, Integer> enchants) {
super(player, treasure, xp);

View File

@ -10,9 +10,9 @@ import org.bukkit.inventory.ItemStack;
* Called just before a player repairs an object with mcMMO.
*/
public class McMMOPlayerRepairCheckEvent extends McMMOPlayerSkillEvent implements Cancellable {
private short repairAmount;
private ItemStack repairMaterial;
private ItemStack repairedObject;
private final short repairAmount;
private final ItemStack repairMaterial;
private final ItemStack repairedObject;
private boolean cancelled;
public McMMOPlayerRepairCheckEvent(Player player, short repairAmount, ItemStack repairMaterial, ItemStack repairedObject) {

View File

@ -10,9 +10,9 @@ import org.bukkit.inventory.ItemStack;
* Called just before a player salvages an item with mcMMO.
*/
public class McMMOPlayerSalvageCheckEvent extends McMMOPlayerSkillEvent implements Cancellable {
private ItemStack salvageItem;
private ItemStack salvageResults;
private ItemStack enchantedBook;
private final ItemStack salvageItem;
private final ItemStack salvageResults;
private final ItemStack enchantedBook;
private boolean cancelled;
public McMMOPlayerSalvageCheckEvent(Player player, ItemStack salvageItem, ItemStack salvageResults, ItemStack enchantedBook) {

View File

@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable;
public class McMMOPlayerDisarmEvent extends McMMOPlayerSkillEvent implements Cancellable {
private boolean cancelled;
private Player defender;
private final Player defender;
public McMMOPlayerDisarmEvent(Player defender) {
super(defender, PrimarySkillType.UNARMED);