GalaxyNetwork/GalaxyBoxPvP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Reduced anchors, tnt, tnt minecarts, end crystal damage by 40%" & made totems have 5 second cooldown

Browse Source
This commit is contained in:
Lncvrt
2024-07-14 11:15:50 -07:00
parent 30bd5c7b66
commit 02d30c3c3e
4 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java
View File

@@ -18,6 +18,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor; import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@@ -101,7 +102,6 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor
getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this); getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this);
getServer().getPluginManager().registerEvents(new BlockBreakListener(this), this); getServer().getPluginManager().registerEvents(new BlockBreakListener(this), this);
getServer().getPluginManager().registerEvents(new CraftItemListener(), this); getServer().getPluginManager().registerEvents(new CraftItemListener(), this);
getServer().getPluginManager().registerEvents(new EntityDamageByEntityListener(), this);
getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this); getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this);
getServer().getPluginManager().registerEvents(new EntityPickupItemListener(this), this); getServer().getPluginManager().registerEvents(new EntityPickupItemListener(this), this);
getServer().getPluginManager().registerEvents(new EntityResurrectListener(this), this); getServer().getPluginManager().registerEvents(new EntityResurrectListener(this), this);

16
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageByEntityListener.java
View File

@@ -1,16 +0,0 @@
package io.github.lncvrt.lncvrtbox.events;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.entity.EntityType;
public class EntityDamageByEntityListener implements Listener {
@EventHandler
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
if (event.getDamager().getType() == EntityType.END_CRYSTAL || event.getDamager().getType() == EntityType.TNT_MINECART || event.getDamager().getType() == EntityType.TNT) {
double damage = event.getDamage();
event.setDamage(damage * 0.4);
}
}
}

5
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java
View File

@@ -1,7 +1,6 @@
package io.github.lncvrt.lncvrtbox.events; package io.github.lncvrt.lncvrtbox.events;
import io.github.lncvrt.lncvrtbox.LncvrtBox; import io.github.lncvrt.lncvrtbox.LncvrtBox;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -34,9 +33,5 @@ public class EntityDamageListener implements Listener {
} }
} }
} }
if (event.getCause() == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION) {
double damage = event.getDamage();
event.setDamage(damage * 0.4);
}
} }
} }

2
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java
View File

@@ -24,7 +24,7 @@ public class EntityResurrectListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
player.setCooldown(Material.TOTEM_OF_UNDYING, 20 * 8); player.setCooldown(Material.TOTEM_OF_UNDYING, 20 * 5);
plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, RESET, player.getName())); plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, RESET, player.getName()));
} }
} }