mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-04 15:27:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed EntityFactory API to better support networking

Browse Source 
EntityFactory API now uses excel entry ids and lookup ids instead of references
Removed huge reliance on passing map references and instead use internal injected map and generated references
Fixed a bug where MapManager was inserting invalid entity ids that were causing a crash when searching through component mappers
This commit is contained in:
Collin Smith
2019-12-26 15:00:48 -08:00
parent 8c572da389
commit d3825290ee
10 changed files with 139 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/d2gs/src/com/riiablo/server/d2gs/D2GS.java
View File

@ -23,7 +23,6 @@ import com.badlogic.gdx.utils.IntIntMap;
import com.badlogic.gdx.utils.TimeUtils;
import com.riiablo.COFs;
import com.riiablo.CharData;
import com.riiablo.CharacterClass;
import com.riiablo.Files;
import com.riiablo.Riiablo;
import com.riiablo.codec.Animation;
@ -42,6 +41,7 @@ import com.riiablo.engine.server.ServerEntityFactory;
import com.riiablo.engine.server.ServerNetworkIdManager;
import com.riiablo.engine.server.WarpInteractor;
import com.riiablo.engine.server.component.Networked;
import com.riiablo.engine.server.component.Player;
import com.riiablo.map.Act1MapBuilder;
import com.riiablo.map.DS1;
import com.riiablo.map.DS1Loader;
@ -386,14 +386,10 @@ public class D2GS extends ApplicationAdapter {
connection.cofTransformsAsByteBuffer().get(cofTransforms);
Gdx.app.log(TAG, " " + DebugUtils.toByteArray(cofTransforms));
CharData charData = new CharData().createD2S(charName, CharacterClass.get(charClass));
// Vector2 origin = map.find(Map.ID.TOWN_ENTRY_1);
// if (origin == null) origin = map.find(Map.ID.TOWN_ENTRY_2);
// if (origin == null) origin = map.find(Map.ID.TP_LOCATION);
// Map.Zone zone = map.getZone(origin);
Vector2 origin = new Vector2(132, 37); // FIXME: hacked for the time being
Map.Zone zone = map.getZone(origin);
int entityId = world.getSystem(ServerEntityFactory.class).createPlayer(map, zone, charData, origin);
Vector2 origin = map.find(Map.ID.TOWN_ENTRY_1);
if (origin == null) origin = map.find(Map.ID.TOWN_ENTRY_2);
if (origin == null) origin = map.find(Map.ID.TP_LOCATION);
int entityId = factory.createPlayer(charName, charClass, origin.x, origin.y);
player.put(packet.id, entityId);
Gdx.app.log(TAG, " entityId=" + entityId);
@ -407,6 +403,8 @@ public class D2GS extends ApplicationAdapter {
outPackets.offer(response);
Synchronize(packet.id, entityId);
CharData charData = world.getMapper(Player.class).get(entityId).data;
BroadcastConnect(packet.id, connection, charData, entityId);
}