nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-04 14:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs with horse riding settings

Browse Source
This commit is contained in:
Beny 2019-05-06 05:37:52 +01:00
parent b44d9439aa
commit 74f4f0eb70
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/eu/habbo/habbohotel/commands/TestCommand.java
View File

@ -157,7 +157,7 @@ public class TestCommand extends Command
((MonsterplantPet) pet).setPubliclyBreedable(false); ((MonsterplantPet) pet).setPubliclyBreedable(false);
((MonsterplantPet) pet).setCanBreed(true); ((MonsterplantPet) pet).setCanBreed(true);
gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetStatusUpdateComposer(pet).compose()); gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetStatusUpdateComposer(pet).compose());
gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetInformationComposer(pet, gameClient.getHabbo().getHabboInfo().getCurrentRoom()).compose()); gameClient.getHabbo().getHabboInfo().getCurrentRoom().sendComposer(new PetInformationComposer(pet, gameClient.getHabbo().getHabboInfo().getCurrentRoom(), gameClient.getHabbo()).compose());
} }
} }

2
src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RequestPetInformationEvent.java
View File

@ -21,7 +21,7 @@ public class RequestPetInformationEvent extends MessageHandler
if(pet != null) if(pet != null)
{ {
this.client.sendResponse(new PetInformationComposer(pet, room)); this.client.sendResponse(new PetInformationComposer(pet, room, this.client.getHabbo()));
} }
} }
} }

11
src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java
View File

@ -3,6 +3,7 @@ package com.eu.habbo.messages.outgoing.rooms.pets;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.pets.*; import com.eu.habbo.habbohotel.pets.*;
import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.Room;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing; import com.eu.habbo.messages.outgoing.Outgoing;
@ -11,11 +12,13 @@ public class PetInformationComposer extends MessageComposer
{ {
private final Pet pet; private final Pet pet;
private final Room room; private final Room room;
private final Habbo requestingHabbo;
public PetInformationComposer(Pet pet, Room room) public PetInformationComposer(Pet pet, Room room, Habbo requestingHabbo)
{ {
this.pet = pet; this.pet = pet;
this.room = room; this.room = room;
this.requestingHabbo = requestingHabbo;
} }
@Override @Override
@ -54,10 +57,10 @@ public class PetInformationComposer extends MessageComposer
this.response.appendString(this.room.getFurniOwnerName(this.pet.getUserId())); //Owner name this.response.appendString(this.room.getFurniOwnerName(this.pet.getUserId())); //Owner name
this.response.appendInt(this.pet instanceof MonsterplantPet ? ((MonsterplantPet) this.pet).getRarity() : 0); this.response.appendInt(this.pet instanceof MonsterplantPet ? ((MonsterplantPet) this.pet).getRarity() : 0);
this.response.appendBoolean(this.pet instanceof RideablePet && ((RideablePet) this.pet).hasSaddle()); this.response.appendBoolean(this.pet instanceof RideablePet && this.requestingHabbo != null && (((RideablePet) this.pet).getRider() == null || this.pet.getUserId() == this.requestingHabbo.getHabboInfo().getId()) && ((RideablePet) this.pet).hasSaddle()); // can ride
this.response.appendBoolean(this.pet instanceof RideablePet && ((RideablePet) this.pet).getRider() != null); this.response.appendBoolean(this.pet instanceof RideablePet && ((RideablePet) this.pet).getRider() != null && this.requestingHabbo != null && ((RideablePet) this.pet).getRider().getHabboInfo().getId() == this.requestingHabbo.getHabboInfo().getId()); // is current user riding
this.response.appendInt(0); this.response.appendInt(0);
this.response.appendInt(this.pet instanceof RideablePet && ((RideablePet) this.pet).anyoneCanRide() ? 1 : 0); this.response.appendInt(this.pet instanceof RideablePet && ((RideablePet) this.pet).anyoneCanRide() ? 1 : 0); // anyone can ride
this.response.appendBoolean(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).canBreed()); //State Grown this.response.appendBoolean(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).canBreed()); //State Grown
this.response.appendBoolean(!(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).isFullyGrown())); //unknown 1 this.response.appendBoolean(!(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).isFullyGrown())); //unknown 1
this.response.appendBoolean(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).isDead()); //Dead this.response.appendBoolean(this.pet instanceof MonsterplantPet && ((MonsterplantPet) this.pet).isDead()); //Dead

2
src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java
View File

@ -51,7 +51,7 @@ public class RoomPetHorseFigureComposer extends MessageComposer
this.response.appendInt(this.pet.getHairColor()); this.response.appendInt(this.pet.getHairColor());
} }
this.response.appendBoolean(this.pet.hasSaddle()); this.response.appendBoolean(this.pet.hasSaddle());
this.response.appendBoolean(this.pet.anyoneCanRide()); this.response.appendBoolean(false); // this.pet.anyoneCanRide()
return this.response; return this.response;
} }
} }