studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

homogenize player controller packet interface
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2025-01-24 14:34:28 -05:00
parent 27fa045a2e
commit 65e3c0703b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/electrosphere/net/client/protocol/EntityProtocol.java
View File

@ -25,6 +25,7 @@ import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.EntityMessage.EntityMessageType; import electrosphere.net.parser.net.message.EntityMessage.EntityMessageType;
import electrosphere.net.synchronization.transport.StateCollection; import electrosphere.net.synchronization.transport.StateCollection;
import electrosphere.net.template.ClientProtocolTemplate; import electrosphere.net.template.ClientProtocolTemplate;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.util.Utilities; import electrosphere.util.Utilities;
/** /**
@ -53,6 +54,10 @@ public class EntityProtocol implements ClientProtocolTemplate<EntityMessage> {
LoggerInterface.loggerNetworking.WARNING("Client received packet for entity that is not in the client scene!"); LoggerInterface.loggerNetworking.WARNING("Client received packet for entity that is not in the client scene!");
Globals.clientSceneWrapper.dumpTranslationLayerStatus(); Globals.clientSceneWrapper.dumpTranslationLayerStatus();
Globals.clientSceneWrapper.dumpIdData(message.getentityID()); Globals.clientSceneWrapper.dumpIdData(message.getentityID());
Entity serverEntity = EntityLookupUtils.getEntityById(message.getentityID());
LoggerInterface.loggerNetworking.WARNING("Entity type: " + CommonEntityUtils.getEntityType(serverEntity));
LoggerInterface.loggerNetworking.WARNING("Entity subtype: " + CommonEntityUtils.getEntitySubtype(serverEntity));
LoggerInterface.loggerNetworking.WARNING("Message type: " + message.getMessageSubtype());
} }
switch(message.getMessageSubtype()){ switch(message.getMessageSubtype()){

5
src/main/java/electrosphere/net/server/player/Player.java
View File

@ -2,8 +2,7 @@ package electrosphere.net.server.player;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.Entity; import electrosphere.entity.Entity;
import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.net.NetUtils;
import electrosphere.net.parser.net.message.EntityMessage;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.ServerConnectionHandler; import electrosphere.net.server.ServerConnectionHandler;
@ -162,7 +161,7 @@ public class Player {
} }
this.playerEntity = playerEntity; this.playerEntity = playerEntity;
if(isReplacing){ if(isReplacing){
this.addMessage(EntityMessage.constructsetPropertyMessage(playerEntity.getId(), System.currentTimeMillis(), 0, CreatureUtils.getControllerPlayerId(playerEntity))); this.addMessage(NetUtils.createSetCreatureControllerIdEntityMessage(playerEntity));
} }
} }