diff --git a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java index 6564310b8..5b6da8cc9 100644 --- a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java +++ b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java @@ -7,6 +7,7 @@ import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import rs09.game.system.SystemLogger; +import rs09.game.system.config.ItemConfigParser; import rs09.game.world.GameWorld; /** @@ -37,7 +38,7 @@ public final class DropItemHandler { } player.getDialogueInterpreter().close(); player.getPulseManager().clear(); - if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve")) { + if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve") || (boolean) item.getDefinition().getHandlers().getOrDefault(ItemConfigParser.DESTROY,false)) { player.getDialogueInterpreter().open(9878, item); return true; } diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt index b64911645..cc634e9ed 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/easter/EasterEvent.kt @@ -60,7 +60,7 @@ class EasterEvent : WorldEvent("easter") { override fun checkActive(): Boolean { val isApril = Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL val isBefore9th = Calendar.getInstance().get(Calendar.DAY_OF_MONTH) < 9 - return (isApril && isBefore9th) + return false } override fun initialize() {