Some bugfixes
This commit is contained in:
+1
@@ -49,6 +49,7 @@ public final class PyramidPlunderActivity extends ActivityPlugin {
|
||||
if (e instanceof Player) {
|
||||
((Player) e).getInterfaceManager().closeOverlay();
|
||||
((PlunderSession) ((Player) e).getAttribute("plunder-session",null)).setActive(false);
|
||||
((Player) e).removeAttribute("plunder-session");
|
||||
}
|
||||
return super.leave(e, logout);
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import core.game.node.entity.npc.NPC;
|
||||
import core.game.node.entity.player.Player;
|
||||
import core.game.node.item.Item;
|
||||
import core.game.system.task.Pulse;
|
||||
import kotlin.Unit;
|
||||
import rs09.game.world.GameWorld;
|
||||
import core.game.world.map.Location;
|
||||
import core.game.world.update.flag.context.Animation;
|
||||
@@ -284,6 +285,10 @@ public final class RugMerchantDialogue extends DialoguePlugin {
|
||||
player.getInterfaceManager().hideTabs(0,1,2,3,4,5,6,7,8,9,10,11,12,13);
|
||||
player.getEquipment().replace(new Item(Items.MAGIC_CARPET_5614),EquipmentContainer.SLOT_WEAPON);
|
||||
player.getPacketDispatch().sendInterfaceConfig(548,69,true);
|
||||
player.logoutListeners.put("magic-carpet", (pl) -> {
|
||||
pl.getEquipment().replace(null,EquipmentContainer.SLOT_WEAPON);
|
||||
return Unit.INSTANCE;
|
||||
});
|
||||
GameWorld.getPulser().submit(new Pulse(1, player) {
|
||||
int count;
|
||||
int index;
|
||||
@@ -323,6 +328,7 @@ public final class RugMerchantDialogue extends DialoguePlugin {
|
||||
player.unlock();
|
||||
player.animate(new Animation(-1));
|
||||
player.getConfigManager().set(499, 0);
|
||||
player.logoutListeners.remove("magic-carpet");
|
||||
break;
|
||||
case 902:
|
||||
player.moveStep();
|
||||
|
||||
@@ -19,6 +19,8 @@ class CookingRewrite : InteractionListener() {
|
||||
init {
|
||||
val list = CookableItems.values().map { it.raw }.toMutableList()
|
||||
list.add(Items.COOKED_MEAT_2142)
|
||||
list.add(RAW_BEEF_2132)
|
||||
list.add(SEAWEED_401)
|
||||
RAW_FOODS = list.toIntArray()
|
||||
}
|
||||
|
||||
@@ -30,11 +32,11 @@ class CookingRewrite : InteractionListener() {
|
||||
val range = obj.name.toLowerCase().contains("range")
|
||||
when (item.id) {
|
||||
RAW_BEEF_2132 -> if (range) {
|
||||
player.dialogueInterpreter.open(CookingDialogue(item,9436,true,obj))
|
||||
player.dialogueInterpreter.open(CookingDialogue(item.id,9436,true,obj))
|
||||
return@onUseWith true
|
||||
}
|
||||
SEAWEED_401 -> if (range) {
|
||||
player.dialogueInterpreter.open(CookingDialogue(item,1781,false,obj))
|
||||
player.dialogueInterpreter.open(CookingDialogue(item.id,1781,false,obj))
|
||||
return@onUseWith true
|
||||
}
|
||||
BREAD_DOUGH_2307, UNCOOKED_CAKE_1889 -> if (!range) {
|
||||
|
||||
Reference in New Issue
Block a user