nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-27 00:40:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-crackable-issue' into 'dev'

Browse Source 
Fix crackable reward wall item

See merge request morningstar/Arcturus-Community!475
This commit is contained in:
Remco 2022-03-03 14:26:25 +00:00
commit d1344c0610
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/eu/habbo/threading/runnables/CrackableExplode.java
View File

@ -1,6 +1,7 @@
package com.eu.habbo.threading.runnables; package com.eu.habbo.threading.runnables;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.items.FurnitureType;
import com.eu.habbo.habbohotel.items.Item; import com.eu.habbo.habbohotel.items.Item;
import com.eu.habbo.habbohotel.items.interactions.InteractionCrackable; import com.eu.habbo.habbohotel.items.interactions.InteractionCrackable;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
@ -34,7 +35,7 @@ public class CrackableExplode implements Runnable {
if (this.habboItem.getRoomId() == 0) { if (this.habboItem.getRoomId() == 0) {
return; return;
} }
//MAKING DINNER BRB
if (!this.habboItem.resetable()) { if (!this.habboItem.resetable()) {
this.room.removeHabboItem(this.habboItem); this.room.removeHabboItem(this.habboItem);
this.room.sendComposer(new RemoveFloorItemComposer(this.habboItem, true).compose()); this.room.sendComposer(new RemoveFloorItemComposer(this.habboItem, true).compose());
@ -43,13 +44,15 @@ public class CrackableExplode implements Runnable {
} else { } else {
this.habboItem.reset(this.room); this.habboItem.reset(this.room);
} }
Item rewardItem = Emulator.getGameEnvironment().getItemManager().getCrackableReward(this.habboItem.getBaseItem().getId()); Item rewardItem = Emulator.getGameEnvironment().getItemManager().getCrackableReward(this.habboItem.getBaseItem().getId());
if (rewardItem != null) { if (rewardItem != null) {
HabboItem newItem = Emulator.getGameEnvironment().getItemManager().createItem(this.habboItem.allowAnyone() ? this.habbo.getHabboInfo().getId() : this.habboItem.getUserId(), rewardItem, 0, 0, ""); HabboItem newItem = Emulator.getGameEnvironment().getItemManager().createItem(this.habboItem.allowAnyone() ? this.habbo.getHabboInfo().getId() : this.habboItem.getUserId(), rewardItem, 0, 0, "");
if (newItem != null) { if (newItem != null) {
if (this.toInventory) { //Add to inventory in case if isn't possible place the item or in case is wall item
if (this.toInventory || newItem.getBaseItem().getType() == FurnitureType.WALL) {
this.habbo.getInventory().getItemsComponent().addItem(newItem); this.habbo.getInventory().getItemsComponent().addItem(newItem);
this.habbo.getClient().sendResponse(new AddHabboItemComposer(newItem)); this.habbo.getClient().sendResponse(new AddHabboItemComposer(newItem));
this.habbo.getClient().sendResponse(new InventoryRefreshComposer()); this.habbo.getClient().sendResponse(new InventoryRefreshComposer());
@ -66,7 +69,6 @@ public class CrackableExplode implements Runnable {
} }
} }
this.room.updateTile(this.room.getLayout().getTile(this.x, this.y)); this.room.updateTile(this.room.getLayout().getTile(this.x, this.y));
} }
} }