mirror of
https://github.com/JEFF-Media-GbR/BetterTridents.git
synced 2024-09-28 20:17:27 +02:00
1.1.0
This commit is contained in:
parent
8eef2cf09b
commit
2fa8a67436
@ -31,7 +31,7 @@ public class Main extends JavaPlugin {
|
|||||||
LOYALTY_TAG = new NamespacedKey(this, "loyalty");
|
LOYALTY_TAG = new NamespacedKey(this, "loyalty");
|
||||||
reload();
|
reload();
|
||||||
Bukkit.getPluginManager().registerEvents(new ProjectileListener(), this);
|
Bukkit.getPluginManager().registerEvents(new ProjectileListener(), this);
|
||||||
Metrics metrics = new Metrics(this, 11460);
|
@SuppressWarnings("unused") Metrics metrics = new Metrics(this, 11460);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reload() {
|
public void reload() {
|
||||||
|
@ -6,9 +6,9 @@ public class Config {
|
|||||||
|
|
||||||
private final Main main = Main.getInstance();
|
private final Main main = Main.getInstance();
|
||||||
|
|
||||||
public static String VOID_SAVING = "void-saving";
|
public static final String VOID_SAVING = "void-saving";
|
||||||
public static String CHECK_FOR_UPDATES = "check-for-updates";
|
public static final String CHECK_FOR_UPDATES = "check-for-updates";
|
||||||
public static String UPDATE_CHECK_INTERVAL = "update-check-interval";
|
public static final String UPDATE_CHECK_INTERVAL = "update-check-interval";
|
||||||
|
|
||||||
public Config() {
|
public Config() {
|
||||||
addDefault(VOID_SAVING, true);
|
addDefault(VOID_SAVING, true);
|
||||||
|
@ -6,7 +6,6 @@ import de.jeff_media.notridentvoid.tasks.WatchTrident;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.Trident;
|
import org.bukkit.entity.Trident;
|
||||||
@ -16,22 +15,11 @@ import org.bukkit.event.Listener;
|
|||||||
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.persistence.PersistentDataContainer;
|
|
||||||
import org.bukkit.persistence.PersistentDataType;
|
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
|
||||||
|
|
||||||
public class ProjectileListener implements Listener {
|
public class ProjectileListener implements Listener {
|
||||||
|
|
||||||
private final Main main = Main.getInstance();
|
private final Main main = Main.getInstance();
|
||||||
|
|
||||||
/*private boolean hasLoyalty(Entity trident) {
|
|
||||||
return trident.getPersistentDataContainer().has(Main.LOYALTY_TAG, PersistentDataType.BYTE);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addLoyalty(Entity trident) {
|
|
||||||
trident.getPersistentDataContainer().set(Main.LOYALTY_TAG,PersistentDataType.BYTE, (byte) 1);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
private boolean hasLoyalty(ItemStack item) {
|
private boolean hasLoyalty(ItemStack item) {
|
||||||
if(!item.hasItemMeta()) return false;
|
if(!item.hasItemMeta()) return false;
|
||||||
ItemMeta meta = item.getItemMeta();
|
ItemMeta meta = item.getItemMeta();
|
||||||
@ -47,14 +35,15 @@ public class ProjectileListener implements Listener {
|
|||||||
if(!(trident.getShooter() instanceof Player)) return;
|
if(!(trident.getShooter() instanceof Player)) return;
|
||||||
Player player = (Player) trident.getShooter();
|
Player player = (Player) trident.getShooter();
|
||||||
ItemStack tridentItem = null;
|
ItemStack tridentItem = null;
|
||||||
|
if(player.getInventory().getItemInOffHand() != null) {
|
||||||
|
if(player.getInventory().getItemInOffHand().getType() == Material.TRIDENT) {
|
||||||
|
tridentItem = player.getInventory().getItemInOffHand();
|
||||||
|
}
|
||||||
|
}
|
||||||
if(player.getInventory().getItemInMainHand() != null) {
|
if(player.getInventory().getItemInMainHand() != null) {
|
||||||
if(player.getInventory().getItemInMainHand().getType() == Material.TRIDENT) {
|
if(player.getInventory().getItemInMainHand().getType() == Material.TRIDENT) {
|
||||||
tridentItem = player.getInventory().getItemInMainHand();
|
tridentItem = player.getInventory().getItemInMainHand();
|
||||||
}
|
}
|
||||||
} else if(player.getInventory().getItemInOffHand() != null) {
|
|
||||||
if(player.getInventory().getItemInOffHand().getType() == Material.TRIDENT) {
|
|
||||||
tridentItem = player.getInventory().getItemInOffHand();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tridentItem == null) return;
|
if(tridentItem == null) return;
|
||||||
if(!hasLoyalty(tridentItem)) return;
|
if(!hasLoyalty(tridentItem)) return;
|
||||||
|
@ -13,7 +13,6 @@ public class RemoveBarrier extends BukkitRunnable {
|
|||||||
private final Block block;
|
private final Block block;
|
||||||
private final Trident trident;
|
private final Trident trident;
|
||||||
private int ticks = 0;
|
private int ticks = 0;
|
||||||
private boolean landed = false;
|
|
||||||
|
|
||||||
public RemoveBarrier(Trident trident, Block block) {
|
public RemoveBarrier(Trident trident, Block block) {
|
||||||
this.block = block;
|
this.block = block;
|
||||||
|
@ -2,7 +2,6 @@ package de.jeff_media.notridentvoid.tasks;
|
|||||||
|
|
||||||
import de.jeff_media.notridentvoid.Main;
|
import de.jeff_media.notridentvoid.Main;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Trident;
|
import org.bukkit.entity.Trident;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
Loading…
Reference in New Issue
Block a user