AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 09:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

metadata: fix build issues

Browse Source
This commit is contained in:
Bixilon 2020-10-04 13:02:33 +02:00
parent 510b164828
commit 22664c3fb8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/bixilon/minosoft/game/datatypes/entities/mob/TropicalFish.java
View File

@ -16,17 +16,17 @@ package de.bixilon.minosoft.game.datatypes.entities.mob;
import de.bixilon.minosoft.game.datatypes.entities.Location; import de.bixilon.minosoft.game.datatypes.entities.Location;
import de.bixilon.minosoft.game.datatypes.entities.Mob; import de.bixilon.minosoft.game.datatypes.entities.Mob;
import de.bixilon.minosoft.game.datatypes.entities.MobInterface; import de.bixilon.minosoft.game.datatypes.entities.MobInterface;
import de.bixilon.minosoft.game.datatypes.entities.meta.AbstractFishMetaData;
import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData; import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData;
import de.bixilon.minosoft.game.datatypes.entities.meta.TropicalFishMetaData;
import java.util.UUID; import java.util.UUID;
public class TropicalFish extends Mob implements MobInterface { public class TropicalFish extends Mob implements MobInterface {
AbstractFishMetaData metaData; TropicalFishMetaData metaData;
public TropicalFish(int entityId, UUID uuid, Location location, short yaw, short pitch, short headYaw, EntityMetaData.MetaDataHashMap sets, int protocolId) { public TropicalFish(int entityId, UUID uuid, Location location, short yaw, short pitch, short headYaw, EntityMetaData.MetaDataHashMap sets, int protocolId) {
super(entityId, uuid, location, yaw, pitch, headYaw); super(entityId, uuid, location, yaw, pitch, headYaw);
this.metaData = new AbstractFishMetaData(sets, protocolId); this.metaData = new TropicalFishMetaData(sets, protocolId);
} }
@Override @Override
@ -36,7 +36,7 @@ public class TropicalFish extends Mob implements MobInterface {
@Override @Override
public void setMetaData(EntityMetaData metaData) { public void setMetaData(EntityMetaData metaData) {
this.metaData = (AbstractFishMetaData) metaData; this.metaData = (TropicalFishMetaData) metaData;
} }
@Override @Override
@ -56,6 +56,6 @@ public class TropicalFish extends Mob implements MobInterface {
@Override @Override
public Class<? extends EntityMetaData> getMetaDataClass() { public Class<? extends EntityMetaData> getMetaDataClass() {
return AbstractFishMetaData.class; return TropicalFishMetaData.class;
} }
} }

10
src/main/java/de/bixilon/minosoft/game/datatypes/entities/objects/SpectralArrow.java
View File

@ -16,14 +16,14 @@ package de.bixilon.minosoft.game.datatypes.entities.objects;
import de.bixilon.minosoft.game.datatypes.entities.EntityObject; import de.bixilon.minosoft.game.datatypes.entities.EntityObject;
import de.bixilon.minosoft.game.datatypes.entities.Location; import de.bixilon.minosoft.game.datatypes.entities.Location;
import de.bixilon.minosoft.game.datatypes.entities.ObjectInterface; import de.bixilon.minosoft.game.datatypes.entities.ObjectInterface;
import de.bixilon.minosoft.game.datatypes.entities.meta.AbstractArrowMetaData;
import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData; import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData;
import de.bixilon.minosoft.game.datatypes.entities.meta.SpectralArrowMetaData;
import java.util.UUID; import java.util.UUID;
public class SpectralArrow extends EntityObject implements ObjectInterface { public class SpectralArrow extends EntityObject implements ObjectInterface {
final int shooter; final int shooter;
AbstractArrowMetaData metaData; SpectralArrowMetaData metaData;
public SpectralArrow(int entityId, UUID uuid, Location location, short yaw, short pitch, int additionalInt) { public SpectralArrow(int entityId, UUID uuid, Location location, short yaw, short pitch, int additionalInt) {
super(entityId, uuid, location, yaw, pitch); super(entityId, uuid, location, yaw, pitch);
@ -32,7 +32,7 @@ public class SpectralArrow extends EntityObject implements ObjectInterface {
public SpectralArrow(int entityId, UUID uuid, Location location, short yaw, short pitch, short headYaw, EntityMetaData.MetaDataHashMap sets, int protocolId) { public SpectralArrow(int entityId, UUID uuid, Location location, short yaw, short pitch, short headYaw, EntityMetaData.MetaDataHashMap sets, int protocolId) {
super(entityId, uuid, location, yaw, pitch, headYaw); super(entityId, uuid, location, yaw, pitch, headYaw);
this.metaData = new AbstractArrowMetaData(sets, protocolId); this.metaData = new SpectralArrowMetaData(sets, protocolId);
this.shooter = 0; // ToDo this.shooter = 0; // ToDo
} }
@ -43,7 +43,7 @@ public class SpectralArrow extends EntityObject implements ObjectInterface {
@Override @Override
public void setMetaData(EntityMetaData metaData) { public void setMetaData(EntityMetaData metaData) {
this.metaData = (AbstractArrowMetaData) metaData; this.metaData = (SpectralArrowMetaData) metaData;
} }
@Override @Override
@ -58,7 +58,7 @@ public class SpectralArrow extends EntityObject implements ObjectInterface {
@Override @Override
public Class<? extends EntityMetaData> getMetaDataClass() { public Class<? extends EntityMetaData> getMetaDataClass() {
return AbstractArrowMetaData.class; return SpectralArrowMetaData.class;
} }
public int getShooter() { public int getShooter() {