1.3.3
This commit is contained in:
parent
00d58e2e2a
commit
cc538bb5c1
6 changed files with 29 additions and 3 deletions
|
|
@ -9,6 +9,7 @@ import pk.ajneb97.api.PlayerKitsAPI;
|
||||||
import pk.ajneb97.configs.ConfigsManager;
|
import pk.ajneb97.configs.ConfigsManager;
|
||||||
import pk.ajneb97.database.MySQLConnection;
|
import pk.ajneb97.database.MySQLConnection;
|
||||||
import pk.ajneb97.listeners.InventoryEditListener;
|
import pk.ajneb97.listeners.InventoryEditListener;
|
||||||
|
import pk.ajneb97.listeners.OtherListener;
|
||||||
import pk.ajneb97.listeners.PlayerListener;
|
import pk.ajneb97.listeners.PlayerListener;
|
||||||
import pk.ajneb97.managers.*;
|
import pk.ajneb97.managers.*;
|
||||||
import pk.ajneb97.managers.dependencies.Metrics;
|
import pk.ajneb97.managers.dependencies.Metrics;
|
||||||
|
|
@ -93,6 +94,7 @@ public class PlayerKits2 extends JavaPlugin {
|
||||||
PluginManager pm = getServer().getPluginManager();
|
PluginManager pm = getServer().getPluginManager();
|
||||||
pm.registerEvents(new PlayerListener(this), this);
|
pm.registerEvents(new PlayerListener(this), this);
|
||||||
pm.registerEvents(new InventoryEditListener(this), this);
|
pm.registerEvents(new InventoryEditListener(this), this);
|
||||||
|
pm.registerEvents(new OtherListener(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reloadPlayerDataSaveTask() {
|
public void reloadPlayerDataSaveTask() {
|
||||||
|
|
|
||||||
21
src/main/java/pk/ajneb97/listeners/OtherListener.java
Normal file
21
src/main/java/pk/ajneb97/listeners/OtherListener.java
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
package pk.ajneb97.listeners;
|
||||||
|
|
||||||
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.entity.EntityType;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
|
|
||||||
|
public class OtherListener implements Listener {
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void fireworkDamage(EntityDamageByEntityEvent event) {
|
||||||
|
Entity damager = event.getDamager();
|
||||||
|
if(event.getEntity() instanceof Player && damager.getType().equals(EntityType.FIREWORK)) {
|
||||||
|
if(damager.hasMetadata("playerkits")) {
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -385,7 +385,7 @@ public class KitsManager {
|
||||||
ActionUtils.title(player,actionLine);
|
ActionUtils.title(player,actionLine);
|
||||||
break;
|
break;
|
||||||
case "firework":
|
case "firework":
|
||||||
ActionUtils.firework(player,actionLine);
|
ActionUtils.firework(player,actionLine,plugin);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,7 @@ public class InventoryEditRequirementsManager {
|
||||||
KitRequirements kitRequirements = kit.getRequirements();
|
KitRequirements kitRequirements = kit.getRequirements();
|
||||||
if(kitRequirements == null){
|
if(kitRequirements == null){
|
||||||
kitRequirements = new KitRequirements();
|
kitRequirements = new KitRequirements();
|
||||||
|
kit.setRequirements(kitRequirements);
|
||||||
}
|
}
|
||||||
kitRequirements.setPrice(price);
|
kitRequirements.setPrice(price);
|
||||||
inventoryEditManager.removeInventoryPlayer(inventoryPlayer.getPlayer());
|
inventoryEditManager.removeInventoryPlayer(inventoryPlayer.getPlayer());
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Firework;
|
import org.bukkit.entity.Firework;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.meta.FireworkMeta;
|
import org.bukkit.inventory.meta.FireworkMeta;
|
||||||
|
import org.bukkit.metadata.FixedMetadataValue;
|
||||||
import pk.ajneb97.PlayerKits2;
|
import pk.ajneb97.PlayerKits2;
|
||||||
import pk.ajneb97.libs.actionbar.ActionBarAPI;
|
import pk.ajneb97.libs.actionbar.ActionBarAPI;
|
||||||
import pk.ajneb97.libs.titles.TitleAPI;
|
import pk.ajneb97.libs.titles.TitleAPI;
|
||||||
|
|
@ -66,7 +67,7 @@ public class ActionUtils {
|
||||||
TitleAPI.sendTitle(player,fadeIn,stay,fadeOut,title,subtitle);
|
TitleAPI.sendTitle(player,fadeIn,stay,fadeOut,title,subtitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void firework(Player player,String actionLine){
|
public static void firework(Player player,String actionLine,PlayerKits2 plugin){
|
||||||
ArrayList<Color> colors = new ArrayList<Color>();
|
ArrayList<Color> colors = new ArrayList<Color>();
|
||||||
FireworkEffect.Type type = null;
|
FireworkEffect.Type type = null;
|
||||||
ArrayList<Color> fadeColors = new ArrayList<Color>();
|
ArrayList<Color> fadeColors = new ArrayList<Color>();
|
||||||
|
|
@ -106,5 +107,6 @@ public class ActionUtils {
|
||||||
fireworkMeta.addEffect(effect);
|
fireworkMeta.addEffect(effect);
|
||||||
fireworkMeta.setPower(power);
|
fireworkMeta.setPower(power);
|
||||||
firework.setFireworkMeta(fireworkMeta);
|
firework.setFireworkMeta(fireworkMeta);
|
||||||
|
firework.setMetadata("playerkits", new FixedMetadataValue(plugin, "no_damage"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
main: pk.ajneb97.PlayerKits2
|
main: pk.ajneb97.PlayerKits2
|
||||||
version: 1.3.2
|
version: 1.3.3
|
||||||
name: PlayerKits2
|
name: PlayerKits2
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
softdepend: [Vault,PlaceholderAPI]
|
softdepend: [Vault,PlaceholderAPI]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue