kaboomserver
/
weapons
mirror of https://github.com/kaboomserver/weapons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix weapon name issue

This commit is contained in:
mathiascode 2019-12-17 19:46:33 +02:00
parent c6bb24a243
commit d7e59d5dc3
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/pw/kaboom/weapons/commands/CommandWeapons.java
View File

@ -29,16 +29,16 @@ public final class CommandWeapons implements CommandExecutor {
final Player player = (Player) sender;
final Inventory inventory = Bukkit.createInventory(null, 18, "Weapons");
addWeapon(inventory, Material.ANVIL, "\\\\u00A7rAnvil Dropper");
addWeapon(inventory, Material.SPECTRAL_ARROW, "\\\\u00A7rArcher");
addWeapon(inventory, Material.FIRE_CHARGE, "\\\\u00A7rArmageddon");
addWeapon(inventory, Material.MAGMA_CREAM, "\\\\u00A7rBlobinator");
addWeapon(inventory, Material.EGG, "\\\\u00A7rGrenade");
addWeapon(inventory, Material.BLAZE_POWDER, "\\\\u00A7rLaser");
addWeapon(inventory, Material.STICK, "\\\\u00A7rLightning Stick");
addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, "\\\\u00A7rMachine Gun");
addWeapon(inventory, Material.BLAZE_ROD, "\\\\u00A7rNuker");
addWeapon(inventory, Material.IRON_HORSE_ARMOR, "\\\\u00A7rSniper");
addWeapon(inventory, Material.ANVIL, "§rAnvil Dropper");
addWeapon(inventory, Material.SPECTRAL_ARROW, "§rArcher");
addWeapon(inventory, Material.FIRE_CHARGE, "§rArmageddon");
addWeapon(inventory, Material.MAGMA_CREAM, "§rBlobinator");
addWeapon(inventory, Material.EGG, "§rGrenade");
addWeapon(inventory, Material.BLAZE_POWDER, "§rLaser");
addWeapon(inventory, Material.STICK, "§rLightning Stick");
addWeapon(inventory, Material.GOLDEN_HORSE_ARMOR, "§rMachine Gun");
addWeapon(inventory, Material.BLAZE_ROD, "§rNuker");
addWeapon(inventory, Material.IRON_HORSE_ARMOR, "§rSniper");
player.openInventory(inventory);
}
return true;

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponAnvilDropper.java
View File

@ -11,7 +11,7 @@ public final class WeaponAnvilDropper {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.ANVIL
&& "\\\\u00A7rAnvil Dropper".equals(name)) {
&& "§rAnvil Dropper".equals(name)) {
final int min = -2;
final int max = 2;

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArcher.java
View File

@ -19,7 +19,7 @@ import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
public final class WeaponArcher implements Listener {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.SPECTRAL_ARROW
&& "\\\\u00A7rArcher".equals(name)) {
&& "§rArcher".equals(name)) {
final Player player = event.getPlayer();
final World world = player.getWorld();

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponArmageddon.java
View File

@ -19,7 +19,7 @@ import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
public final class WeaponArmageddon implements Listener {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.FIRE_CHARGE
&& "\\\\u00A7rArmageddon".equals(name)) {
&& "§rArmageddon".equals(name)) {
final Player player = event.getPlayer();
final World world = player.getWorld();

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponBlobinator.java
View File

@ -25,7 +25,7 @@ import pw.kaboom.weapons.Main;
public final class WeaponBlobinator implements Listener {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.MAGMA_CREAM
&& "\\\\u00A7rBlobinator".equals(name)) {
&& "§rBlobinator".equals(name)) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector velocity = eyeLocation.getDirection().multiply(8);

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponGrenade.java
View File

@ -17,7 +17,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
public final class WeaponGrenade implements Listener {
public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.EGG
&& "\\u00A7rGrenade".equals(name)) {
&& "§rGrenade".equals(name)) {
event.setCancelled(true);
final Player player = event.getPlayer();

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLaser.java
View File

@ -19,7 +19,7 @@ public final class WeaponLaser {
public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.BLAZE_POWDER
&& "\\\\u00A7rLaser".equals(name)) {
&& "§rLaser".equals(name)) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector direction = eyeLocation.getDirection();

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponLightningStick.java
View File

@ -13,7 +13,7 @@ public final class WeaponLightningStick {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.STICK
&& "\\\\u00A7rLightning Stick".equals(name)) {
&& "§rLightning Stick".equals(name)) {
final int maxDistance = 100;
final Location lookLocation = event.getPlayer().getTargetBlock((Set<Material>) null, maxDistance).getLocation();
final World world = event.getPlayer().getWorld();

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponMachineGun.java
View File

@ -31,7 +31,7 @@ public final class WeaponMachineGun implements Listener {
public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.GOLDEN_HORSE_ARMOR
&& "\\\\u00A7rMachine Gun".equals(name)) {
&& "§rMachine Gun".equals(name)) {
final UUID playerUUID = event.getPlayer().getUniqueId();
if (!machineGunActive.contains(playerUUID)) {

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponNuker.java
View File

@ -15,7 +15,7 @@ public final class WeaponNuker {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.BLAZE_ROD
&& "\\\\u00A7rNuker".equals(name)) {
&& "§rNuker".equals(name)) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector velocity = eyeLocation.getDirection().multiply(10);

2
src/main/java/pw/kaboom/weapons/modules/weapons/WeaponSniper.java
View File

@ -17,7 +17,7 @@ public final class WeaponSniper {
public static void leftClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.IRON_HORSE_ARMOR
&& "\\\\u00A7rSniper".equals(name)) {
&& "§rSniper".equals(name)) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector velocity = eyeLocation.getDirection().multiply(12);