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

Update InteractionTrap.java

Browse Source
This commit is contained in:
brenoepic 2022-04-29 00:28:10 -03:00
parent 2aace7ef9a
commit b087b8ace9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java
View File

@ -22,7 +22,8 @@ public class InteractionTrap extends InteractionDefault {
@Override @Override
public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception {
if (!this.getExtradata().equals("0")) { if (this.getExtradata().equals("0") || roomUnit == null || room.getHabbo(roomUnit) == null) return;
Habbo habbo = room.getHabbo(roomUnit); Habbo habbo = room.getHabbo(roomUnit);
int effect = habbo.getClient().getHabbo().getRoomUnit().getEffectId(); int effect = habbo.getClient().getHabbo().getRoomUnit().getEffectId();
roomUnit.stopWalking(); roomUnit.stopWalking();
@ -33,11 +34,9 @@ public class InteractionTrap extends InteractionDefault {
delay = 3000; delay = 3000;
} }
if (roomUnit != null) {
if (this.getBaseItem().getEffectF() > 0 || this.getBaseItem().getEffectM() > 0) { if (this.getBaseItem().getEffectF() > 0 || this.getBaseItem().getEffectM() > 0) {
if (roomUnit.getRoomUnitType().equals(RoomUnitType.USER)) { if (roomUnit.getRoomUnitType().equals(RoomUnitType.USER)) {
if (habbo != null) {
if (habbo.getHabboInfo().getGender().equals(HabboGender.M) && this.getBaseItem().getEffectM() > 0 && habbo.getRoomUnit().getEffectId() != this.getBaseItem().getEffectM()) { if (habbo.getHabboInfo().getGender().equals(HabboGender.M) && this.getBaseItem().getEffectM() > 0 && habbo.getRoomUnit().getEffectId() != this.getBaseItem().getEffectM()) {
room.giveEffect(habbo, this.getBaseItem().getEffectM(), -1); room.giveEffect(habbo, this.getBaseItem().getEffectM(), -1);
return; return;
@ -55,9 +54,7 @@ public class InteractionTrap extends InteractionDefault {
roomUnit.setCanWalk(true); roomUnit.setCanWalk(true);
room.giveEffect(roomUnit, effect, -1); room.giveEffect(roomUnit, effect, -1);
}, delay); }, delay);
}
}
}
} }
} }
} }