Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-04-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the mount handler (closes #1)

Browse Source
This commit is contained in:
Ammon Lauritzen 2016-02-19 11:41:58 -06:00
parent 62dfd9ec0d
commit 943cadcf3a
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/fairies/proxy/CommonProxy.java
View File

@ -76,23 +76,20 @@ public class CommonProxy {
}
// Packet that handles fairy mounting.
public void sendFairyMount(final Entity entity1, final Entity entity2) {
Entity rider = entity1;
Entity vehicle = entity2;
if (entity1.ridingEntity != null && entity1.ridingEntity == entity2) {
vehicle = null;
public void sendFairyMount(final Entity rider, final Entity vehicle) {
final Entity newVehicle;
if (rider.ridingEntity != null && rider.ridingEntity == vehicle) {
newVehicle = null;
} else {
newVehicle = vehicle;
}
S1BPacketEntityAttach packet = new S1BPacketEntityAttach(0, entity1, entity2);
final S1BPacketEntityAttach packet = new S1BPacketEntityAttach(0, rider, newVehicle);
sendToAllPlayers(packet);
/*
* TODO: deal with fishhook case :)
if (!( entity1 instanceof FRY_EntityFishHook )) {
entity1.mountEntity(entity2);
if (!(rider instanceof FairyEntityFishHook)) {
rider.mountEntity(newVehicle);
}
*/
}
// Packet that handles forced fairy despawning.