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

Add support for Minecraft 1.16 

Closes #1
This commit is contained in:
mathiascode 2021-01-07 13:23:07 +02:00
parent 520669c26d
commit 305dcd12fd
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
&& "§rAnvil Dropper".equals(name)) {
&& ("§rAnvil Dropper".equals(name) || "Anvil 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
&& "§rArcher".equals(name)) {
&& ("§rArcher".equals(name) || "Archer".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
&& "§rArmageddon".equals(name)) {
&& ("§rArmageddon".equals(name) || "Armageddon".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
&& "§rBlobinator".equals(name)) {
&& ("§rBlobinator".equals(name) || "Blobinator".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
&& "§rGrenade".equals(name)) {
&& ("§rGrenade".equals(name) || "Grenade".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
&& "§rLaser".equals(name)) {
&& ("§rLaser".equals(name) || "Laser".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
&& "§rLightning Stick".equals(name)) {
&& ("§rLightning Stick".equals(name) || "Lightning 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

@ -32,7 +32,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
&& "§rMachine Gun".equals(name)) {
&& ("§rMachine Gun".equals(name) || "Machine 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
&& "§rNuker".equals(name)) {
&& ("§rNuker".equals(name) || "Nuker".equals(name))) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector velocity = eyeLocation.getDirection().multiply(10);

4
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
&& "§rSniper".equals(name)) {
&& ("§rSniper".equals(name) || "Sniper".equals(name))) {
final Player player = event.getPlayer();
final Location eyeLocation = player.getEyeLocation();
final Vector velocity = eyeLocation.getDirection().multiply(12);
@ -42,7 +42,7 @@ public final class WeaponSniper {
public static void rightClick(final Material item, final String name, final PlayerInteractEvent event) {
if (item == Material.IRON_HORSE_ARMOR
&& "\\\\u00A7rSniper".equals(name)) {
&& ("§rSniper".equals(name) || "Sniper".equals(name))) {
final Player player = event.getPlayer();
if (player.hasPotionEffect(PotionEffectType.SLOW)) {