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

switch to primitive boolean rather than Boolean 

thanks to Elspeth on Discord for letting me know about the difference!
This commit is contained in:
TheTechRobo 2022-06-08 16:57:30 -04:00
parent 8e504744ea
commit 9b0c12e669
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ public class DeathListener implements Listener {
public void onPlayerJoin(PlayerJoinEvent e) { public void onPlayerJoin(PlayerJoinEvent e) {
this.scores.addPlayerToScoreboard(e.getPlayer()); this.scores.addPlayerToScoreboard(e.getPlayer());
// v ITEM DUPING PREVENTION // v ITEM DUPING PREVENTION
Boolean banned = (this.scores.load(e.getPlayer(), "bannedByLSPLUGIN", 0, false) == 1); boolean banned = (this.scores.load(e.getPlayer(), "bannedByLSPLUGIN", 0, false) == 1);
if (banned) { if (banned) {
e.getPlayer().getInventory().clear(); e.getPlayer().getInventory().clear();
Bukkit.getLogger().info("Player was UNBANNED after being BANNED."); Bukkit.getLogger().info("Player was UNBANNED after being BANNED.");
@ -57,11 +57,11 @@ public class DeathListener implements Listener {
ItemStack i = p.getInventory().getItemInMainHand(); ItemStack i = p.getInventory().getItemInMainHand();
if (!(i.hasItemMeta())) return; if (!(i.hasItemMeta())) return;
Boolean rightclickair = (e.getAction() == Action.RIGHT_CLICK_AIR); boolean rightclickair = (e.getAction() == Action.RIGHT_CLICK_AIR);
if (!rightclickair) { if (!rightclickair) {
return; return;
} }
Boolean heartblock = (i.getType() == Material.PLAYER_HEAD && rightclickair); boolean heartblock = (i.getType() == Material.PLAYER_HEAD && rightclickair);
if (heartblock) { if (heartblock) {
this.scores.dieHearts(p, -4.0); this.scores.dieHearts(p, -4.0);
ItemStack newi = i.clone(); ItemStack newi = i.clone();
@ -74,15 +74,15 @@ public class DeathListener implements Listener {
} }
Life d = new Life(); Life d = new Life();
d.create(); d.create();
Boolean condition1a = (i.getItemMeta().getDisplayName().equals(d.dn)); boolean condition1a = (i.getItemMeta().getDisplayName().equals(d.dn));
// DO NOT CHANGE THIS TO // DO NOT CHANGE THIS TO
// i.getItemMeta().displayName().equals(Component.text(d.dn)) // i.getItemMeta().displayName().equals(Component.text(d.dn))
// IT DOES NOT WORK. I am sick of figuring out why. // IT DOES NOT WORK. I am sick of figuring out why.
// It caused many minutes of frustration at the computer. // It caused many minutes of frustration at the computer.
// Just... don't. // Just... don't.
// Unless you're ready to deal with insanity. // Unless you're ready to deal with insanity.
Boolean condition1b = (i.getType() == d.m); boolean condition1b = (i.getType() == d.m);
Boolean lifeblock = (condition1a && condition1b); boolean lifeblock = (condition1a && condition1b);
if (lifeblock) { if (lifeblock) {
this.scores.die(p, -1); this.scores.die(p, -1);
p.getInventory().removeItem(d.item); p.getInventory().removeItem(d.item);

2
src/ca/thetechrobo/smp/LifestealPlugin.java
View File

@ -61,7 +61,7 @@ public class LifestealPlugin extends JavaPlugin {
recipe = new ShapedRecipe(key, item); recipe = new ShapedRecipe(key, item);
recipe.shape("RRR", "RDR", "RRR"); recipe.shape("RRR", "RDR", "RRR");
recipe.setIngredient('R', Material.REDSTONE_BLOCK); recipe.setIngredient('R', Material.REDSTONE_BLOCK);
recipe.setIngredient('D', Material.DIAMOND); recipe.setIngredient('D', Material.NETHERITE_SCRAP);
Bukkit.addRecipe(recipe); Bukkit.addRecipe(recipe);
} }
@Override @Override