Skip to content

Commit 56b33a8

Browse files
author
BuildTools
committed
fixes and tweaks
1 parent cd987bb commit 56b33a8

File tree

9 files changed

+496
-86
lines changed

9 files changed

+496
-86
lines changed

‎src/me/stevemmmmm/thepitremake/commands/EnchantCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
167167
"Assassin", "Billy", "BooBoo", "Cricket", "CriticallyFunky", "DavidandGoliath", "DiamondAllergy",
168168
"DoubleJump", "EscapePod", "FractionalReserve", "GottaGoFast", "Hearts", "LastStand", "Lodbrok",
169169
"McSwimmer", "Mirror", "Negotiator", "NotGladiator", "Pebble", "Peroxide", "Prick", "Protection",
170-
"PurpleGold", "RespawnAbsorption", "Revitalize", "RingArmor", "Selfcheckout", "Solitude", "TNT",
170+
"PurpleGold", "RespawnAbsorption", "Revitalize", "RGM", "RingArmor", "Selfcheckout", "Solitude", "TNT",
171171
"CriticallyRich", "GoldBoost", "GoldBump", "Moctezuma", "StrikeGold", "Sweaty", "XPBoost", "XPBump"
172172
));
173173
}

‎src/me/stevemmmmm/thepitremake/commands/UnenchantCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class UnenchantCommand implements CommandExecutor, TabCompleter {
1919

2020
private void sendErrorMessage(Player player, String message) {
21-
player.sendMessage(ChatColor.RED.toString() + ChatColor.BOLD + "WHOOPS!" + ChatColor.GRAY + " " + message);
21+
player.sendMessage(ChatColor.RED.toString() + ChatColor.BOLD + "WHOOPS!" + ChatColor.GRAY + "" + message);
2222
}
2323

2424
@Override

‎src/me/stevemmmmm/thepitremake/core/Main.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public class Main extends JavaPlugin implements ServerGame, Listener {
8585
public static String prefix;
8686
public static String version;
8787
private static final int WORKER_THREADS = 4;
88+
private Killstreak killstreak;
8889

8990
static {
9091
prefix = ChatColor.YELLOW.toString() + ChatColor.BOLD + "Fabian's Pit Sandbox " + ChatColor.LIGHT_PURPLE + " ▶ ";
@@ -184,11 +185,12 @@ public void onPacketSending(PacketEvent event) {
184185
getServer().getPluginManager().registerEvents(new ChatManagement(), this);
185186
getServer().getPluginManager().registerEvents(new TogglePvPCommand(), this);
186187
getServer().getPluginManager().registerEvents(new AntiFire(), this);
187-
Killstreak killstreak = new Killstreak();
188-
getServer().getPluginManager().registerEvents(killstreak, this);
188+
getServer().getPluginManager().registerEvents(Killstreak.getInstance(), this);
189189
getServer().getPluginManager().registerEvents(new LivesSystem(), this);
190190
getServer().getPluginManager().registerEvents(new KillAnnouncementCommand(), this);
191191

192+
this.killstreak = Killstreak.getInstance();
193+
192194
getCommand("pitenchant").setExecutor(new EnchantCommand());
193195
getCommand("mysticenchants").setExecutor(new MysticEnchantsCommand());
194196
getCommand("pitabout").setExecutor(new PitAboutCommand());
@@ -310,6 +312,7 @@ private void registerPerks() {
310312
new PurpleGold(),
311313
new RespawnAbsorption(),
312314
new Revitalize(),
315+
new RGM(),
313316
new RingArmor(),
314317
new Selfcheckout(),
315318
new Solitude(),

‎src/me/stevemmmmm/thepitremake/enchants/pants/RGM.java

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package me.stevemmmmm.thepitremake.enchants.pants;
2+
3+
import me.stevemmmmm.thepitremake.managers.enchants.CustomEnchant;
4+
import me.stevemmmmm.thepitremake.managers.enchants.EnchantGroup;
5+
import me.stevemmmmm.thepitremake.managers.enchants.EnchantProperty;
6+
import me.stevemmmmm.thepitremake.managers.enchants.LoreBuilder;
7+
import org.bukkit.ChatColor;
8+
import org.bukkit.Location;
9+
import org.bukkit.Material;
10+
import org.bukkit.Sound;
11+
import org.bukkit.entity.Arrow;
12+
import org.bukkit.entity.Player;
13+
import org.bukkit.event.EventHandler;
14+
import org.bukkit.event.entity.EntityDamageByEntityEvent;
15+
16+
import java.util.ArrayList;
17+
18+
/*
19+
* Copyright (c) 2020. Created by Stevemmmmm.
20+
*/
21+
22+
public class RGM extends CustomEnchant {
23+
private final EnchantProperty<Integer> cooldownTime = new EnchantProperty<>(5, 4, 3);
24+
25+
@EventHandler
26+
public void onHit(EntityDamageByEntityEvent event) {
27+
}
28+
29+
@Override
30+
public void applyEnchant(int level, Object... args) {
31+
}
32+
33+
@Override
34+
public String getName() {
35+
return "Retro-Gravity Microcosm";
36+
}
37+
38+
@Override
39+
public String getEnchantReferenceName() {
40+
return "RGM";
41+
}
42+
43+
@Override
44+
public ArrayList<String> getDescription(int level) {
45+
LoreBuilder loreBuilder = new LoreBuilder();
46+
47+
loreBuilder.declareVariable("1.25❤", "1.5❤", "0.5❤")
48+
.write("When a player hits you from above ground ").setColor(ChatColor.YELLOW).write("3 times").resetColor().write(" in a row:").next()
49+
.write("You heal ").setColor(ChatColor.RED).write("1.25❤").resetColor();
50+
51+
if (level == 2) {
52+
loreBuilder.next().write("Gain ").setColor(ChatColor.RED).write("1.5❤").resetColor().write(" damage vs them for 30s");
53+
}
54+
55+
if (level == 3) {
56+
loreBuilder.next().write("Gain ").setColor(ChatColor.RED).write("1.5❤").resetColor().write(" damage vs them for 30s").next()
57+
.write("They take ").setColor(ChatColor.RED).write("0.5❤").resetColor().write(" true damage");
58+
}
59+
60+
return loreBuilder.build();
61+
}
62+
63+
@Override
64+
public boolean isDisabledOnPassiveWorld() {
65+
return false;
66+
}
67+
68+
@Override
69+
public EnchantGroup getEnchantGroup() {
70+
return EnchantGroup.B;
71+
}
72+
73+
@Override
74+
public boolean isRareEnchant() {
75+
return true;
76+
}
77+
78+
@Override
79+
public Material[] getEnchantItemTypes() {
80+
return new Material[] { Material.LEATHER_LEGGINGS };
81+
}
82+
}

‎src/me/stevemmmmm/thepitremake/game/DamageIndicator.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import me.stevemmmmm.thepitremake.managers.enchants.DamageManager;
55
import org.bukkit.ChatColor;
66
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
7+
import org.bukkit.entity.Arrow;
78
import org.bukkit.entity.Player;
89
import org.bukkit.event.EventHandler;
910
import org.bukkit.event.Listener;
@@ -28,14 +29,33 @@ public static DamageIndicator getInstance() {
2829

2930
@EventHandler
3031
public void onHit(EntityDamageByEntityEvent event) {
31-
if (!(event.getDamager() instanceof Player) || !(event.getEntity() instanceof Player)) return;
32+
if (!(event.getDamager() instanceof Player) || !(event.getEntity() instanceof Player)) {
33+
if (event.getDamager() instanceof Arrow) {
34+
Arrow arrow = (Arrow) event.getDamager();
35+
if (arrow.getShooter() instanceof Player) {
36+
Player shooter = (Player) arrow.getShooter();
37+
Player attacked = (Player) event.getEntity();
38+
39+
if (RegionManager.getInstance().playerIsInRegion(attacked, RegionManager.RegionType.SPAWN) ||
40+
!DamageManager.getInstance().isEventNotCancelled(event) ||
41+
DamageManager.getInstance().playerIsInCanceledEvent(shooter)) {
42+
return;
43+
}
44+
45+
displayIndicator(shooter, attacked, DamageManager.getInstance().getFinalDamageFromEvent(event));
46+
}
47+
}
48+
return;
49+
}
3250

3351
Player damager = (Player) event.getDamager();
3452
Player attacked = (Player) event.getEntity();
3553

3654
if (RegionManager.getInstance().playerIsInRegion(attacked, RegionManager.RegionType.SPAWN) ||
3755
!DamageManager.getInstance().isEventNotCancelled(event) ||
38-
DamageManager.getInstance().playerIsInCanceledEvent(damager)) return;
56+
DamageManager.getInstance().playerIsInCanceledEvent(damager)) {
57+
return;
58+
}
3959

4060
displayIndicator(damager, attacked, DamageManager.getInstance().getFinalDamageFromEvent(event));
4161
}

‎src/me/stevemmmmm/thepitremake/game/duels/GameUtility.java

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,62 @@ public void onDeath(PlayerDeathEvent event) {
3636
player.performCommand("setgold 10000000");
3737
}
3838
}
39+
//public class GameUtility implements Listener {
40+
//public GameUtility() {
41+
//}
42+
43+
//@EventHandler
44+
//public void onJoin(PlayerJoinEvent event) {
45+
// Player player = event.getPlayer();
46+
// this.giveStuff(player);
47+
// player.setMaxHealth(20.0);
48+
// player.setFoodLevel(19);
49+
//}
50+
//@EventHandler
51+
//public void onHunger(FoodLevelChangeEvent event) {
52+
// event.setCancelled(true);
53+
//}
54+
//
55+
//private void giveStuff(Player player) {
56+
// ItemStack[] armor = new ItemStack[4];
57+
//
58+
// Material[] armorTypes = {Material.CHAINMAIL_BOOTS, Material.CHAINMAIL_LEGGINGS, Material.CHAINMAIL_CHESTPLATE, null};
59+
// for (int i = 0; i < armorTypes.length; i++) {
60+
// if (armorTypes[i] != null) {
61+
// ItemStack armorPiece = new ItemStack(armorTypes[i]);
62+
// ItemMeta armorMeta = armorPiece.getItemMeta();
63+
// if (armorMeta != null) {
64+
// armorMeta.spigot().setUnbreakable(true);
65+
// armorPiece.setItemMeta(armorMeta);
66+
// }
67+
// armor[i] = armorPiece;
68+
// } else {
69+
// armor[i] = null;
70+
// }
71+
// }
72+
//
73+
// player.getInventory().setArmorContents(armor);
74+
//
75+
// boolean hasIronSword = false;
76+
// for (ItemStack item : player.getInventory().getContents()) {
77+
// if (item != null && item.getType() == Material.IRON_SWORD) {
78+
// hasIronSword = true;
79+
// break;
80+
// }
81+
// }
82+
//
83+
// if (!hasIronSword) {
84+
// ItemStack ironSword = new ItemStack(Material.IRON_SWORD, 1);
85+
// ItemMeta swordMeta = ironSword.getItemMeta();
86+
// swordMeta.spigot().setUnbreakable(true);
87+
// ironSword.setItemMeta(swordMeta);
88+
// player.getInventory().addItem(ironSword);
89+
// }
90+
//}
91+
//
92+
//@EventHandler
93+
//public void onDeath(PlayerDeathEvent event) {
94+
// Player player = event.getEntity();
95+
// this.giveStuff(player);
96+
//}
97+
//}

0 commit comments

Comments
 (0)