EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 04:25:26 +02:00
Code Issues Projects Releases Wiki Activity

Code Cleanup pt 3

Browse Source
This commit is contained in:
nossr50
2019-04-03 19:55:52 -07:00
parent 43037f8c13
commit 0ca0140348
44 changed files with 66 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@@ -308,12 +308,10 @@ public final class BlockUtils {
case COBBLESTONE :
case DIRT :
case GRASS_PATH :
return true;
case STONE_BRICKS:
return true;
case COBBLESTONE_WALL:
case STONE_BRICKS:
return true;
default :

12
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@@ -175,11 +175,10 @@ public class EventUtils {
return event;
}
public static FakePlayerAnimationEvent callFakeArmSwingEvent(Player player) {
public static void callFakeArmSwingEvent(Player player) {
FakePlayerAnimationEvent event = new FakePlayerAnimationEvent(player);
mcMMO.p.getServer().getPluginManager().callEvent(event);
return event;
}
public static boolean handleLevelChangeEvent(Player player, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason) {
@@ -198,7 +197,7 @@ public class EventUtils {
return !isCancelled;
}
public static boolean handleLevelChangeEventEdit(Player player, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason, int oldLevel) {
public static void handleLevelChangeEventEdit(Player player, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason, int oldLevel) {
McMMOPlayerLevelChangeEvent event = isLevelUp ? new McMMOPlayerLevelUpEvent(player, skill, levelsChanged - oldLevel, xpGainReason) : new McMMOPlayerLevelDownEvent(player, skill, levelsChanged, xpGainReason);
mcMMO.p.getServer().getPluginManager().callEvent(event);
@@ -211,7 +210,6 @@ public class EventUtils {
profile.addXp(skill, xpRemoved);
}
return !isCancelled;
}
/**
@@ -371,11 +369,10 @@ public class EventUtils {
return !isCancelled;
}
public static McMMOPlayerAbilityDeactivateEvent callAbilityDeactivateEvent(Player player, SuperAbilityType ability) {
public static void callAbilityDeactivateEvent(Player player, SuperAbilityType ability) {
McMMOPlayerAbilityDeactivateEvent event = new McMMOPlayerAbilityDeactivateEvent(player, PrimarySkillType.byAbility(ability));
mcMMO.p.getServer().getPluginManager().callEvent(event);
return event;
}
public static McMMOPlayerFishingTreasureEvent callFishingTreasureEvent(Player player, ItemStack treasureDrop, int treasureXp, Map<Enchantment, Integer> enchants) {
@@ -385,11 +382,10 @@ public class EventUtils {
return event;
}
public static FakePlayerFishEvent callFakeFishEvent(Player player, FishHook hook) {
public static void callFakeFishEvent(Player player, FishHook hook) {
FakePlayerFishEvent event = new FakePlayerFishEvent(player, null, hook, PlayerFishEvent.State.FISHING);
mcMMO.p.getServer().getPluginManager().callEvent(event);
return event;
}
public static McMMOPlayerRepairCheckEvent callRepairCheckEvent(Player player, short durability, ItemStack repairMaterial, ItemStack repairedObject) {

6
src/main/java/com/gmail/nossr50/util/Permissions.java
View File

@@ -217,13 +217,13 @@ public final class Permissions {
PluginManager pluginManager = server.getPluginManager();
for (World world : server.getWorlds()) {
addDynamicPermission("mcmmo.commands.ptp.world." + world.getName(), PermissionDefault.OP, pluginManager);
addDynamicPermission("mcmmo.commands.ptp.world." + world.getName(), pluginManager);
}
}
private static void addDynamicPermission(String permissionName, PermissionDefault permissionDefault, PluginManager pluginManager) {
private static void addDynamicPermission(String permissionName, PluginManager pluginManager) {
Permission permission = new Permission(permissionName);
permission.setDefault(permissionDefault);
permission.setDefault(PermissionDefault.OP);
pluginManager.addPermission(permission);
}
}

16
src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java
View File

@@ -11,57 +11,46 @@ import org.bukkit.block.Block;
public class NullChunkletManager implements ChunkletManager {
@Override
public void loadChunklet(int cx, int cy, int cz, World world) {
return;
}
@Override
public void unloadChunklet(int cx, int cy, int cz, World world) {
return;
}
@Override
public void loadChunk(int cx, int cz, World world) {
return;
}
@Override
public void unloadChunk(int cx, int cz, World world) {
return;
}
@Override
public void chunkLoaded(int cx, int cz, World world) {
return;
}
@Override
public void chunkUnloaded(int cx, int cz, World world) {
return;
}
@Override
public void saveWorld(World world) {
return;
}
@Override
public void unloadWorld(World world) {
return;
}
@Override
public void loadWorld(World world) {
return;
}
@Override
public void saveAll() {
return;
}
@Override
public void unloadAll() {
return;
}
@Override
@@ -76,26 +65,21 @@ public class NullChunkletManager implements ChunkletManager {
@Override
public void setTrue(int x, int y, int z, World world) {
return;
}
@Override
public void setTrue(Block block) {
return;
}
@Override
public void setFalse(int x, int y, int z, World world) {
return;
}
@Override
public void setFalse(Block block) {
return;
}
@Override
public void cleanUp() {
return;
}
}

7
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@@ -154,11 +154,8 @@ public class HashChunkManager implements ChunkManager {
public synchronized void unloadChunk(int cx, int cz, World world) {
saveChunk(cx, cz, world);
if (store.containsKey(world.getName() + "," + cx + "," + cz)) {
store.remove(world.getName() + "," + cx + "," + cz);
//closeChunkStore(world, cx, cz);
}
//closeChunkStore(world, cx, cz);
store.remove(world.getName() + "," + cx + "," + cz);
}
@Override

8
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java
View File

@@ -147,15 +147,15 @@ public class McMMOSimpleRegionFile {
return file;
}
public synchronized boolean testCloseTimeout() {
/*
/* public synchronized boolean testCloseTimeout() {
*//*
if (System.currentTimeMillis() - TIMEOUT_TIME > lastAccessTime) {
close();
return true;
}
*/
*//*
return false;
}
}*/
public synchronized DataOutputStream getOutputStream(int x, int z) {
int index = getChunkIndex(x, z);

2
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java
View File

@@ -13,7 +13,7 @@ public class NullChunkManager implements ChunkManager {
public void closeAll() {}
@Override
public ChunkStore readChunkStore(World world, int x, int z) throws IOException {
public ChunkStore readChunkStore(World world, int x, int z) {
return null;
}

2
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
View File

@@ -28,7 +28,6 @@ public class BlockStoreConversionMain implements Runnable {
}
this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
return;
}
@Override
@@ -87,6 +86,5 @@ public class BlockStoreConversionMain implements Runnable {
this.world = null;
this.scheduler = null;
this.converters = null;
return;
}
}

1
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java
View File

@@ -29,7 +29,6 @@ public class BlockStoreConversionXDirectory implements Runnable {
}
this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
return;
}
@Override

1
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
View File

@@ -41,7 +41,6 @@ public class BlockStoreConversionZDirectory implements Runnable {
}
this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
return;
}
@Override

2
src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
View File

@@ -115,7 +115,7 @@ public final class CommandUtils {
}
public static boolean hasPlayerDataKey(CommandSender sender) {
if (sender == null || !(sender instanceof Player)) {
if (!(sender instanceof Player)) {
return false;
}

2
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
View File

@@ -435,8 +435,6 @@ public class ScoreboardWrapper {
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
switch (sidebarType) {
case NONE:
break;
case SKILL_BOARD:
Validate.notNull(targetSkill);

9
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -330,7 +330,7 @@ public final class CombatUtils {
Wolf wolf = (Wolf) damager;
AnimalTamer tamer = wolf.getOwner();
if (tamer != null && tamer instanceof Player && PrimarySkillType.TAMING.shouldProcess(target)) {
if (tamer instanceof Player && PrimarySkillType.TAMING.shouldProcess(target)) {
Player master = (Player) tamer;
if (!Misc.isNPCEntity(master) && PrimarySkillType.TAMING.getPermissions(master)) {
@@ -342,7 +342,7 @@ public final class CombatUtils {
Arrow arrow = (Arrow) damager;
ProjectileSource projectileSource = arrow.getShooter();
if (projectileSource != null && projectileSource instanceof Player && PrimarySkillType.ARCHERY.shouldProcess(target)) {
if (projectileSource instanceof Player && PrimarySkillType.ARCHERY.shouldProcess(target)) {
Player player = (Player) projectileSource;
if (!Misc.isNPCEntity(player) && PrimarySkillType.ARCHERY.getPermissions(player)) {
@@ -774,10 +774,10 @@ public final class CombatUtils {
return scaledModifiers;
}
public static EntityDamageByEntityEvent applyScaledModifiers(double initialDamage, double finalDamage, EntityDamageByEntityEvent event) {
public static void applyScaledModifiers(double initialDamage, double finalDamage, EntityDamageByEntityEvent event) {
// No additional damage
if (initialDamage == finalDamage) {
return event;
return;
}
for (DamageModifier modifier : DamageModifier.values()) {
@@ -793,7 +793,6 @@ public final class CombatUtils {
event.setDamage(modifier, finalDamage / initialDamage * event.getDamage(modifier));
}
return event;
}
/**

2
src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java
View File

@@ -74,7 +74,6 @@ public final class ParticleEffectUtils {
public static void playAbilityEnabledEffect(Player player) {
if (!MainConfig.getInstance().getAbilityActivationEffectEnabled()) {
return;
}
/* if (hasHeadRoom(player)) {
@@ -84,7 +83,6 @@ public final class ParticleEffectUtils {
public static void playAbilityDisabledEffect(Player player) {
if (!MainConfig.getInstance().getAbilityDeactivationEffectEnabled()) {
return;
}
/*if (hasHeadRoom(player)) {

4
src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
View File

@@ -82,13 +82,11 @@ public class SoundManager {
case SKILL_UNLOCKED:
return Sound.UI_TOAST_CHALLENGE_COMPLETE;
case ABILITY_ACTIVATED_BERSERK:
case TIRED:
return Sound.BLOCK_CONDUIT_AMBIENT;
case ABILITY_ACTIVATED_GENERIC:
return Sound.ITEM_TRIDENT_RIPTIDE_3;
case DEFLECT_ARROWS:
return Sound.ENTITY_ENDER_EYE_DEATH;
case TIRED:
return Sound.BLOCK_CONDUIT_AMBIENT;
case BLEED:
return Sound.ENTITY_ENDER_EYE_DEATH;
default: