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

spawn painting as entity

Browse Source
This commit is contained in:
Bixilon 2020-07-05 14:20:45 +02:00
parent adef1ed8ca
commit b6c224ad5b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/game/datatypes/entities/objects/Painting.java
View File

@ -15,12 +15,15 @@ package de.bixilon.minosoft.game.datatypes.entities.objects;
import de.bixilon.minosoft.game.datatypes.entities.*; import de.bixilon.minosoft.game.datatypes.entities.*;
import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData; import de.bixilon.minosoft.game.datatypes.entities.meta.EntityMetaData;
import de.bixilon.minosoft.game.datatypes.world.BlockPosition;
import de.bixilon.minosoft.protocol.protocol.ProtocolVersion; import de.bixilon.minosoft.protocol.protocol.ProtocolVersion;
import java.util.HashMap; import java.util.HashMap;
public class Painting extends EntityObject implements ObjectInterface { public class Painting extends EntityObject implements ObjectInterface {
EntityMetaData metaData; EntityMetaData metaData;
int direction;
String title;
public Painting(int entityId, Location location, short yaw, short pitch, int additionalInt) { public Painting(int entityId, Location location, short yaw, short pitch, int additionalInt) {
super(entityId, location, yaw, pitch, null); super(entityId, location, yaw, pitch, null);
@ -36,6 +39,12 @@ public class Painting extends EntityObject implements ObjectInterface {
this.metaData = new EntityMetaData(sets, version); this.metaData = new EntityMetaData(sets, version);
} }
public Painting(int entityId, BlockPosition position, int direction, String title) {
super(entityId, new Location(position.getX(), position.getY(), position.getZ()), (short) 0, (short) 0, null);
this.direction = direction;
this.title = title;
}
@Override @Override
public Entities getEntityType() { public Entities getEntityType() {
return Entities.PAINTING; return Entities.PAINTING;

2
src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
View File

@ -17,6 +17,7 @@ import de.bixilon.minosoft.game.datatypes.GameMode;
import de.bixilon.minosoft.game.datatypes.blocks.Blocks; import de.bixilon.minosoft.game.datatypes.blocks.Blocks;
import de.bixilon.minosoft.game.datatypes.entities.meta.HumanMetaData; import de.bixilon.minosoft.game.datatypes.entities.meta.HumanMetaData;
import de.bixilon.minosoft.game.datatypes.entities.mob.OtherPlayer; import de.bixilon.minosoft.game.datatypes.entities.mob.OtherPlayer;
import de.bixilon.minosoft.game.datatypes.entities.objects.Painting;
import de.bixilon.minosoft.game.datatypes.player.PlayerInfo; import de.bixilon.minosoft.game.datatypes.player.PlayerInfo;
import de.bixilon.minosoft.game.datatypes.player.PlayerInfoBulk; import de.bixilon.minosoft.game.datatypes.player.PlayerInfoBulk;
import de.bixilon.minosoft.game.datatypes.scoreboard.ScoreboardObjective; import de.bixilon.minosoft.game.datatypes.scoreboard.ScoreboardObjective;
@ -426,6 +427,7 @@ public class PacketHandler {
} }
public void handle(PacketSpawnPainting pkg) { public void handle(PacketSpawnPainting pkg) {
connection.getPlayer().getWorld().addEntity(new Painting(pkg.getEntityId(), pkg.getPosition(), pkg.getDirection(), pkg.getTitle()));
} }
public void handle(PacketEntity pkg) { public void handle(PacketEntity pkg) {