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

Add own PlayerEntity to World entities

Browse Source
This commit is contained in:
Bixilon 2020-11-19 12:49:09 +01:00
parent 8ebcc20b82
commit be4821daf3
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,9 @@ public class PacketHandler {
connection.getPlayer().getWorld().setHardcore(pkg.isHardcore()); connection.getPlayer().getWorld().setHardcore(pkg.isHardcore());
connection.getMapping().setDimensions(pkg.getDimensions()); connection.getMapping().setDimensions(pkg.getDimensions());
connection.getPlayer().getWorld().setDimension(pkg.getDimension()); connection.getPlayer().getWorld().setDimension(pkg.getDimension());
connection.getPlayer().setEntity(new PlayerEntity(connection, pkg.getEntityId(), connection.getPlayer().getPlayerUUID(), null, null, connection.getPlayer().getPlayerName(), new PlayerPropertyData[]{}, null)); PlayerEntity entity = new PlayerEntity(connection, pkg.getEntityId(), connection.getPlayer().getPlayerUUID(), null, null, connection.getPlayer().getPlayerName(), new PlayerPropertyData[]{}, null);
connection.getPlayer().setEntity(entity);
connection.getPlayer().getWorld().addEntity(entity);
connection.getSender().sendChatMessage("I am alive! ~ Minosoft"); connection.getSender().sendChatMessage("I am alive! ~ Minosoft");
} }
@ -374,13 +376,7 @@ public class PacketHandler {
} }
public void handle(PacketEntityMetadata pkg) { public void handle(PacketEntityMetadata pkg) {
Entity entity; Entity entity= connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
if (pkg.getEntityId() == connection.getPlayer().getEntity().getEntityId()) {
// our own meta data...set it
entity = connection.getPlayer().getEntity();
} else {
entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
}
if(entity == null){ if(entity == null){
// thanks mojang // thanks mojang
return; return;
@ -466,13 +462,7 @@ public class PacketHandler {
} }
public void handle(PacketEntityEffect pkg) { public void handle(PacketEntityEffect pkg) {
Entity entity; Entity entity= connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
if (pkg.getEntityId() == connection.getPlayer().getEntity().getEntityId()) {
// that's us!
entity = connection.getPlayer().getEntity();
} else {
entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
}
if(entity == null){ if(entity == null){
// thanks mojang // thanks mojang
return; return;
@ -481,13 +471,7 @@ public class PacketHandler {
} }
public void handle(PacketRemoveEntityEffect pkg) { public void handle(PacketRemoveEntityEffect pkg) {
Entity entity; Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
if (pkg.getEntityId() == connection.getPlayer().getEntity().getEntityId()) {
// that's us!
entity = connection.getPlayer().getEntity();
} else {
entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
}
if(entity == null){ if(entity == null){
// thanks mojang // thanks mojang
return; return;
@ -525,13 +509,7 @@ public class PacketHandler {
} }
public void handle(PacketAttachEntity pkg) { public void handle(PacketAttachEntity pkg) {
Entity entity; Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
if (pkg.getEntityId() == connection.getPlayer().getEntity().getEntityId()) {
// that's us!
entity = connection.getPlayer().getEntity();
} else {
entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
}
if(entity == null){ if(entity == null){
// thanks mojang // thanks mojang
return; return;