smp
/
lifesteal
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Less deprecations, more Purpur

This commit is contained in:
TheTechRobo 2022-03-15 21:47:37 -04:00
parent 76af6ddb0f
commit 02b791e1c6
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ca/thetechrobo/smp/DeathListener.java
View File

@ -45,15 +45,7 @@ public class DeathListener implements Listener {
if (!rightclickair) {
return;
}
Boolean condition1a = (i.getItemMeta().getDisplayName().equals(d.dn));
Boolean condition1b = (i.getType() == d.m);
Boolean lifeblock = (condition1a && condition1b && rightclickair);
Boolean heartblock = (i.getType() == Material.PLAYER_HEAD && rightclickair);
if (lifeblock) {
this.scores.die(p, -1);
p.getInventory().removeItem(d.item);
return;
}
if (heartblock) {
this.scores.dieHearts(p, -4.0);
ItemStack newi = i.clone();
@ -61,9 +53,18 @@ public class DeathListener implements Listener {
p.getInventory().removeItem(newi);
return;
}
if (!(i.hasDisplayName())) return;
Boolean condition1a = (i.getItemMeta().displayName().equals(d.dn));
Boolean condition1b = (i.getType() == d.m);
Boolean lifeblock = (condition1a && condition1b && rightclickair);
if (lifeblock) {
this.scores.die(p, -1);
p.getInventory().removeItem(d.item);
return;
}
LifeExtractor f = new LifeExtractor();
f.create();
if ((i.getType() == f.m) && (i.getItemMeta().getDisplayName().equals(f.dn))) {
if ((i.getType() == f.m) && (i.getItemMeta().displayName().equals(f.dn))) {
if (p.getInventory().firstEmpty() == (-1)) {
p.sendMessage("§4Not enough room in your inventory.");
p.playSound(p, Sound.ENTITY_ENDERMAN_TELEPORT, 76, 0);

8
src/ca/thetechrobo/smp/DeleteMyData.java
View File

@ -13,6 +13,9 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
public class DeleteMyData implements CommandExecutor {
private ScoreboardWrapper scores;
@ -37,7 +40,10 @@ public class DeleteMyData implements CommandExecutor {
Player sender = (Player) senderr;
if (args[0].equals(String.valueOf(this.scores.load(sender, "delete", null)))) {
Bukkit.getBanList(Type.NAME).addBan(sender.getName(), "Deleted data.", null, null);
sender.kickPlayer("Your server data has been irrecoverably deleted.");
Component kickmsg = Component.text("Your server data has been ")
.append(Component.text("irrecoverably deleted.")
.color(TextColor.color(245, 5, 5)));
sender.kick(kickmsg);
String uuid = sender.getUniqueId().toString();
Path path = Paths.get("world/playerdata/" + uuid+".dat");
try {

6
src/ca/thetechrobo/smp/ScoreboardWrapper.java
View File

@ -20,6 +20,8 @@ import org.bukkit.scoreboard.Score;
import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.ScoreboardManager;
import net.kyori.adventure.text.Component;
public class ScoreboardWrapper {
private ScoreboardManager manager;
private HashMap<String, Scoreboard> boards;
@ -66,7 +68,6 @@ public class ScoreboardWrapper {
lives.setDisplaySlot(DisplaySlot.SIDEBAR);
Score score = lives.getScore(p.getName());
this.boards.put(p.getName(), temp);
Bukkit.broadcastMessage("It Works!");
score.setScore(load(p, "lives", 2));
p.setScoreboard(this.boards.get(p.getName()));
}
@ -94,7 +95,8 @@ public class ScoreboardWrapper {
calendar.add(Calendar.DAY_OF_YEAR, 5);
Date date = calendar.getTime();
Bukkit.getBanList(Type.NAME).addBan(p.getName(), "Ran out of lives.", date, null);
p.kickPlayer("Ran out of lives. Come back later.");
Component kickmsg = Component.text("Ran out of lives. Come back later.");
p.kick(kickmsg);
}
return curscore;
}