From ae3d8897e8236a520e12eba565656b34131b1e78 Mon Sep 17 00:00:00 2001 From: Jules Date: Fri, 3 Apr 2020 00:18:51 +0200 Subject: [PATCH 1/2] You can now level up the default class --- .../mmocore/api/player/PlayerData.java | 59 +++++++++++-------- .../Indyuce/mmocore/manager/ClassManager.java | 2 +- .../data/mysql/MySQLPlayerDataManager.java | 2 +- .../data/yaml/YAMLPlayerDataManager.java | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index 9b2a37c0..de74ff36 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -54,12 +54,16 @@ import net.mmogroup.mmolib.version.VersionSound; public class PlayerData extends OfflinePlayerData { /* - * is updated everytime the player joins the server. it is kept when the - * player is offline so the plugin can use #isOnline to check if the player - * is online + * is updated everytime the player joins the server. it is kept when the player + * is offline so the plugin can use #isOnline to check if the player is online */ private Player player; + /* + * 'profess' can be null, you need to retrieve the player class using the + * getProfess() method which should never return null if the plugin is + * configured right + */ private PlayerClass profess; private int level, experience, classPoints, skillPoints, attributePoints, attributeReallocationPoints;// skillReallocationPoints, private double mana, stamina, stellium; @@ -104,7 +108,8 @@ public class PlayerData extends OfflinePlayerData { try { profess = profess == null ? null : MMOCore.plugin.classManager.get(profess.getId()); } catch (NullPointerException exception) { - MMOCore.log(Level.SEVERE, "[Userdata] Could not find class " + getProfess().getId() + " while refreshing player data."); + MMOCore.log(Level.SEVERE, + "[Userdata] Could not find class " + getProfess().getId() + " while refreshing player data."); } int j = 0; @@ -114,7 +119,8 @@ public class PlayerData extends OfflinePlayerData { j++; } catch (NullPointerException notFound) { boundSkills.remove(j); - MMOCore.log(Level.SEVERE, "[Userdata] Could not find skill " + boundSkills.get(j).getSkill().getId() + " in class " + getProfess().getId() + " while refreshing player data."); + MMOCore.log(Level.SEVERE, "[Userdata] Could not find skill " + boundSkills.get(j).getSkill().getId() + + " in class " + getProfess().getId() + " while refreshing player data."); } } @@ -218,13 +224,13 @@ public class PlayerData extends OfflinePlayerData { public void giveLevels(int value) { int total = 0; while (value-- > 0) - total += MMOCore.plugin.configManager.getNeededExperience(getLevel() + value + 1, profess); + total += MMOCore.plugin.configManager.getNeededExperience(getLevel() + value + 1, getProfess()); giveExperience(total); } public void setExperience(int value) { experience = Math.max(0, value); - refreshVanillaExp(MMOCore.plugin.configManager.getNeededExperience(getLevel() + 1, profess)); + refreshVanillaExp(MMOCore.plugin.configManager.getNeededExperience(getLevel() + 1, getProfess())); } public void refreshVanillaExp(float needed) { @@ -295,7 +301,8 @@ public class PlayerData extends OfflinePlayerData { } public void heal(double heal) { - double newest = Math.max(0, Math.min(player.getHealth() + heal, player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())); + double newest = Math.max(0, + Math.min(player.getHealth() + heal, player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())); if (player.getHealth() == newest) return; @@ -341,7 +348,9 @@ public class PlayerData extends OfflinePlayerData { setLastFriendRequest(System.currentTimeMillis()); FriendRequest request = new FriendRequest(this, target); - new ConfigMessage("friend-request").addPlaceholders("player", getPlayer().getName(), "uuid", request.getUniqueId().toString()).sendAsJSon(target.getPlayer()); + new ConfigMessage("friend-request") + .addPlaceholders("player", getPlayer().getName(), "uuid", request.getUniqueId().toString()) + .sendAsJSon(target.getPlayer()); MMOCore.plugin.requestManager.registerRequest(request); } @@ -350,10 +359,12 @@ public class PlayerData extends OfflinePlayerData { giveStellium(-waypoint.getStelliumCost()); new BukkitRunnable() { - int x = player.getLocation().getBlockX(), y = player.getLocation().getBlockY(), z = player.getLocation().getBlockZ(), t; + int x = player.getLocation().getBlockX(), y = player.getLocation().getBlockY(), + z = player.getLocation().getBlockZ(), t; public void run() { - if (player.getLocation().getBlockX() != x || player.getLocation().getBlockY() != y || player.getLocation().getBlockZ() != z) { + if (player.getLocation().getBlockX() != x || player.getLocation().getBlockY() != y + || player.getLocation().getBlockZ() != z) { player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1, .5f); MMOCore.plugin.configManager.getSimpleMessage("warping-canceled").send(player); giveStellium(waypoint.getStelliumCost()); @@ -361,7 +372,8 @@ public class PlayerData extends OfflinePlayerData { return; } - MMOCore.plugin.configManager.getSimpleMessage("warping-comencing", "left", "" + ((120 - t) / 20)).send(player); + MMOCore.plugin.configManager.getSimpleMessage("warping-comencing", "left", "" + ((120 - t) / 20)) + .send(player); if (t++ >= 100) { player.teleport(waypoint.getLocation()); player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 20, 1, false, false)); @@ -370,10 +382,13 @@ public class PlayerData extends OfflinePlayerData { return; } - player.playSound(player.getLocation(), VersionSound.BLOCK_NOTE_BLOCK_BELL.toSound(), 1, (float) (t / Math.PI * .015 + .5)); + player.playSound(player.getLocation(), VersionSound.BLOCK_NOTE_BLOCK_BELL.toSound(), 1, + (float) (t / Math.PI * .015 + .5)); double r = Math.sin((double) t / 100 * Math.PI); for (double j = 0; j < Math.PI * 2; j += Math.PI / 4) - MMOLib.plugin.getVersion().getWrapper().spawnParticle(Particle.REDSTONE, player.getLocation().add(Math.cos((double) t / 20 + j) * r, (double) t / 50, Math.sin((double) t / 20 + j) * r), 1.25f, Color.PURPLE); + MMOLib.plugin.getVersion().getWrapper().spawnParticle(Particle.REDSTONE, player.getLocation() + .add(Math.cos((double) t / 20 + j) * r, (double) t / 50, Math.sin((double) t / 20 + j) * r), + 1.25f, Color.PURPLE); } }.runTaskTimer(MMOCore.plugin, 0, 1); } @@ -387,7 +402,7 @@ public class PlayerData extends OfflinePlayerData { } public void giveExperience(int value, Location loc) { - if (profess == null || hasReachedMaxLevel()) { + if (hasReachedMaxLevel()) { setExperience(0); return; } @@ -395,7 +410,9 @@ public class PlayerData extends OfflinePlayerData { // display hologram if (MMOCore.plugin.getConfig().getBoolean("display-exp-holograms")) if (loc != null && MMOCore.plugin.hologramSupport != null) - MMOCore.plugin.hologramSupport.displayIndicator(loc.add(.5, 1.5, .5), MMOCore.plugin.configManager.getSimpleMessage("exp-hologram", "exp", "" + value).message(), getPlayer()); + MMOCore.plugin.hologramSupport.displayIndicator(loc.add(.5, 1.5, .5), + MMOCore.plugin.configManager.getSimpleMessage("exp-hologram", "exp", "" + value).message(), + getPlayer()); value = MMOCore.plugin.boosterManager.calculateExp(null, value); value *= 1 + getStats().getStat(StatType.ADDITIONAL_EXPERIENCE) / 100; @@ -409,7 +426,7 @@ public class PlayerData extends OfflinePlayerData { int needed; boolean check = false; - while (experience >= (needed = MMOCore.plugin.configManager.getNeededExperience(getLevel() + 1, profess))) { + while (experience >= (needed = MMOCore.plugin.configManager.getNeededExperience(getLevel() + 1, getProfess()))) { if (hasReachedMaxLevel()) { experience = 0; @@ -517,8 +534,8 @@ public class PlayerData extends OfflinePlayerData { } /* - * returns if the action bar is not being used to display anything else and - * if the general info action bar can be displayed + * returns if the action bar is not being used to display anything else and if + * the general info action bar can be displayed */ public boolean canSeeActionBar() { return actionBarTimeOut < System.currentTimeMillis(); @@ -614,10 +631,6 @@ public class PlayerData extends OfflinePlayerData { getStats().getMap().updateAll(); } - public void setProfess(PlayerClass profess) { - this.profess = profess; - } - public boolean hasSkillBound(int slot) { return slot < boundSkills.size(); } diff --git a/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java b/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java index f5ae45c1..a8f23dc6 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/ClassManager.java @@ -72,7 +72,7 @@ public class ClassManager extends MMOManager { } public void reloadPlayerClasses() { - PlayerData.getAll().forEach(data -> data.setProfess(get(data.getProfess().getId()))); + PlayerData.getAll().forEach(data -> data.setClass(get(data.getProfess().getId()))); } @Override diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java index 507c904b..ca9fdf68 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java @@ -50,7 +50,7 @@ public class MySQLPlayerDataManager extends PlayerDataManager { data.setLevel(result.getInt("level")); data.setExperience(result.getInt("experience")); if (!isEmpty(result.getString("class"))) - data.setProfess(MMOCore.plugin.classManager.get(result.getString("class"))); + data.setClass(MMOCore.plugin.classManager.get(result.getString("class"))); data.setMana(data.getStats().getStat(StatType.MAX_MANA)); data.setStamina(data.getStats().getStat(StatType.MAX_STAMINA)); data.setStellium(data.getStats().getStat(StatType.MAX_STELLIUM)); diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java index fa0d50a3..99f866c9 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java @@ -31,7 +31,7 @@ public class YAMLPlayerDataManager extends PlayerDataManager { data.setLevel(config.getInt("level")); data.setExperience(config.getInt("experience")); if (config.contains("class")) - data.setProfess(MMOCore.plugin.classManager.get(config.getString("class"))); + data.setClass(MMOCore.plugin.classManager.get(config.getString("class"))); data.setMana(data.getStats().getStat(StatType.MAX_MANA)); data.setStamina(data.getStats().getStat(StatType.MAX_STAMINA)); data.setStellium(data.getStats().getStat(StatType.MAX_STELLIUM)); From b31bd18dec68b729aa844060394542600f9ffea3 Mon Sep 17 00:00:00 2001 From: Aria Sangarin Date: Fri, 3 Apr 2020 19:12:41 +0200 Subject: [PATCH 2/2] (Hopefully) fixed temp blocks --- src/main/java/net/Indyuce/mmocore/listener/BlockListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java index 183519ba..b66e60ba 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java @@ -77,8 +77,8 @@ public class BlockListener implements Listener { * remove vanilla drops if needed */ if (!info.hasVanillaDrops()) { - event.setDropItems(false); // May not work - // event.setCancelled(true); + //event.setDropItems(false); // May not work + event.setCancelled(true); event.getBlock().setType(Material.AIR); }