minecraft-mods/mineclass-spigot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the on respawn event who don't reapply class

Browse Source
This commit is contained in:
Barazok
2020-10-24 17:53:47 +02:00
parent a55001a2ad
commit 3a0c992a07
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/babamod/mineclass/classes/MineClassFactory.java
View File

@@ -1,5 +1,6 @@
package net.babamod.mineclass.classes; package net.babamod.mineclass.classes;
import net.babamod.mineclass.utils.AppliedStatus;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
@@ -61,7 +62,8 @@ public class MineClassFactory {
public synchronized Optional<MineClass> getRightClass(Player player) { public synchronized Optional<MineClass> getRightClass(Player player) {
for (Map.Entry<String, MineClass> stringMineClassEntry : availableClasses.entrySet()) { for (Map.Entry<String, MineClass> stringMineClassEntry : availableClasses.entrySet()) {
if (stringMineClassEntry.getValue().is(player)) { if (AppliedStatus.getInstance().getStatus(player).equals(stringMineClassEntry.getKey())
|| stringMineClassEntry.getValue().is(player)) {
return Optional.of(stringMineClassEntry.getValue()); return Optional.of(stringMineClassEntry.getValue());
} }
} }

2
src/main/java/net/babamod/mineclass/classes/MineClassImpl.java
View File

@@ -30,7 +30,7 @@ public abstract class MineClassImpl implements MineClass {
player.addPotionEffect( player.addPotionEffect(
new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false)); new PotionEffect(key, Integer.MAX_VALUE, value - 1, false, false));
}); });
AppliedStatus.getInstance().setStatus(player.getName(), getCode()); AppliedStatus.getInstance().setStatus(player, getCode());
} }
@Override @Override

6
src/main/java/net/babamod/mineclass/commands/CommandClass.java
View File

@@ -18,19 +18,19 @@ public class CommandClass implements CommandExecutor {
if (sender instanceof Player) { if (sender instanceof Player) {
Player player = (Player) sender; Player player = (Player) sender;
if (MineClassFactory.getInstance().getAvailableClassCodes().contains(args[0])) { if (MineClassFactory.getInstance().getAvailableClassCodes().contains(args[0])) {
AppliedStatus.getInstance().setStatus(player.getName(), args[0]); AppliedStatus.getInstance().setStatus(player, args[0]);
MineClassFactory.clearAllClassEffects(player); MineClassFactory.clearAllClassEffects(player);
MineClassFactory.getInstance().reapplyEffectsByCode(args[0], player); MineClassFactory.getInstance().reapplyEffectsByCode(args[0], player);
MineClassFactory.getInstance().giveItemsForClassByCode(args[0], player); MineClassFactory.getInstance().giveItemsForClassByCode(args[0], player);
return true; return true;
} }
if (args[0].equals("clear")) { if (args[0].equals("clear")) {
AppliedStatus.getInstance().setStatus(player.getName(), null); AppliedStatus.getInstance().setStatus(player, null);
MineClassFactory.clearAllClassEffects(player); MineClassFactory.clearAllClassEffects(player);
return true; return true;
} }
if (args[0].equals("whoami")) { if (args[0].equals("whoami")) {
String classCode = AppliedStatus.getInstance().getStatus(player.getName()); String classCode = AppliedStatus.getInstance().getStatus(player);
if (classCode != null && !classCode.equals("none")) { if (classCode != null && !classCode.equals("none")) {
player.sendMessage(String.format("You are a %s.", classCode)); player.sendMessage(String.format("You are a %s.", classCode));
} else { } else {

14
src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java
View File

@@ -144,7 +144,7 @@ public class MineClassListeners implements Listener {
@EventHandler @EventHandler
public void on(BlockDropItemEvent event) { public void on(BlockDropItemEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (AppliedStatus.getInstance().getStatus(player.getName()).equals("fire_dwarf")) { if (AppliedStatus.getInstance().getStatus(player).equals("fire_dwarf")) {
event event
.getItems() .getItems()
.forEach( .forEach(
@@ -166,7 +166,7 @@ public class MineClassListeners implements Listener {
((AbstractArrow) event.getProjectile()) ((AbstractArrow) event.getProjectile())
.setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED); .setPickupStatus(AbstractArrow.PickupStatus.DISALLOWED);
} }
if (AppliedStatus.getInstance().getStatus(player.getName()).equals("fire_dwarf")) { if (AppliedStatus.getInstance().getStatus(player).equals("fire_dwarf")) {
event.getProjectile().setFireTicks(10000); event.getProjectile().setFireTicks(10000);
} }
} }
@@ -178,8 +178,8 @@ public class MineClassListeners implements Listener {
if (event.getEntity() instanceof Player) { if (event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();
if (event.getCause().equals(EntityDamageEvent.DamageCause.FALL) if (event.getCause().equals(EntityDamageEvent.DamageCause.FALL)
&& (AppliedStatus.getInstance().getStatus(player.getName()).equals("elf") && (AppliedStatus.getInstance().getStatus(player).equals("elf")
|| AppliedStatus.getInstance().getStatus(player.getName()).equals("ender_elf"))) { || AppliedStatus.getInstance().getStatus(player).equals("ender_elf"))) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@@ -189,7 +189,7 @@ public class MineClassListeners implements Listener {
public void on(FoodLevelChangeEvent event) { public void on(FoodLevelChangeEvent event) {
if (event.getEntity() instanceof Player) { if (event.getEntity() instanceof Player) {
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();
if (AppliedStatus.getInstance().getStatus(player.getName()).equals("elf")) { if (AppliedStatus.getInstance().getStatus(player).equals("elf")) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@@ -199,7 +199,7 @@ public class MineClassListeners implements Listener {
public void on(EntityDamageByEntityEvent event) { public void on(EntityDamageByEntityEvent event) {
if (event.getDamager() instanceof Player) { if (event.getDamager() instanceof Player) {
Player player = (Player) event.getDamager(); Player player = (Player) event.getDamager();
if (AppliedStatus.getInstance().getStatus(player.getName()).equals("ender_elf") if (AppliedStatus.getInstance().getStatus(player).equals("ender_elf")
&& player.getInventory().getItemInMainHand().getType().equals(Material.ENDER_PEARL)) { && player.getInventory().getItemInMainHand().getType().equals(Material.ENDER_PEARL)) {
PlayerHitCounter.getInstance().increaseHitCount(player); PlayerHitCounter.getInstance().increaseHitCount(player);
if (player.getAttackCooldown() == 1) { if (player.getAttackCooldown() == 1) {
@@ -225,7 +225,7 @@ public class MineClassListeners implements Listener {
@EventHandler @EventHandler
public void on(PlayerInteractEvent event) { public void on(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (AppliedStatus.getInstance().getStatus(player.getName()).equals("ender_elf") if (AppliedStatus.getInstance().getStatus(player).equals("ender_elf")
&& event.getItem() != null && event.getItem() != null
&& event.getItem().getType().equals(Material.ENDER_PEARL)) { && event.getItem().getType().equals(Material.ENDER_PEARL)) {
if (event.getAction().equals(Action.RIGHT_CLICK_AIR) if (event.getAction().equals(Action.RIGHT_CLICK_AIR)

14
src/main/java/net/babamod/mineclass/utils/AppliedStatus.java
View File

@@ -1,5 +1,7 @@
package net.babamod.mineclass.utils; package net.babamod.mineclass.utils;
import org.bukkit.entity.Player;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
@@ -24,12 +26,16 @@ public class AppliedStatus implements Serializable {
return INSTANCE; return INSTANCE;
} }
public synchronized void setStatus(String playerName, String status) { public synchronized void setStatus(Player player, String status) {
appliedStatus.put(playerName, status); appliedStatus.put(player.getName(), status);
} }
public synchronized String getStatus(String playerName) { public synchronized String getStatus(Player player) {
return appliedStatus.getOrDefault(playerName, "none"); return appliedStatus.getOrDefault(player.getName(), "none");
}
public synchronized boolean hasClass(Player player) {
return appliedStatus.get(player.getName()) != null;
} }
@Override @Override