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

Various fixes

Browse Source
This commit is contained in:
austin 2021-07-31 10:12:57 -04:00
parent c25ab0229c
commit 57c94eccf8
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Data/creatures.json
View File

@ -106,7 +106,7 @@
"type" : "MELEE_WEAPON_SWING_ONE_HAND", "type" : "MELEE_WEAPON_SWING_ONE_HAND",
"animationName" : "Armature|SwingWeapon", "animationName" : "Armature|SwingWeapon",
"damageStartFrame" : 30, "damageStartFrame" : 30,
"damageEndFrame" : 50 "damageEndFrame" : 120
} }
], ],
"healthSystem" : { "healthSystem" : {

9
src/main/java/electrosphere/game/server/world/datacell/ServerDataCell.java
View File

@ -9,6 +9,7 @@ import electrosphere.game.server.character.Character;
import electrosphere.game.server.world.virtualcell.VirtualCell; import electrosphere.game.server.world.virtualcell.VirtualCell;
import electrosphere.main.Globals; import electrosphere.main.Globals;
import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.parser.net.message.NetworkMessage;
import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
@ -20,8 +21,8 @@ import java.util.List;
*/ */
public class ServerDataCell { public class ServerDataCell {
List<Entity> loadedEntities; List<Entity> loadedEntities = new LinkedList();
List<Player> activePlayers; List<Player> activePlayers = new LinkedList();
/** /**
@ -94,7 +95,9 @@ public class ServerDataCell {
*/ */
public void broadcastNetworkMessage(NetworkMessage message){ public void broadcastNetworkMessage(NetworkMessage message){
for(Player player : activePlayers){ for(Player player : activePlayers){
player.addMessage(message); if(player != Globals.serverPlayer){
player.addMessage(message);
}
} }
} }

4
src/main/java/electrosphere/game/state/MicroSimulation.java
View File

@ -99,7 +99,9 @@ public class MicroSimulation {
//clear collidable impulse lists //clear collidable impulse lists
Globals.collisionEngine.clearCollidableImpulseLists(); Globals.collisionEngine.clearCollidableImpulseLists();
//data cell manager update //data cell manager update
Globals.dataCellManager.updatePlayerPositions(); if(Globals.dataCellManager != null){
Globals.dataCellManager.updatePlayerPositions();
}
} }
public boolean isReady(){ public boolean isReady(){

3
src/main/java/electrosphere/net/server/Player.java
View File

@ -19,7 +19,8 @@ public class Player {
int simulationRadius = 3; int simulationRadius = 3;
Entity playerEntity; Entity playerEntity;
public Player(){ public Player(ServerConnectionHandler connectionHandler){
this.connectionHandler = connectionHandler;
idIncrementerLock.acquireUninterruptibly(); idIncrementerLock.acquireUninterruptibly();
id = idIncrementer; id = idIncrementer;
idIncrementer++; idIncrementer++;

3
src/main/java/electrosphere/net/server/ServerConnectionHandler.java
View File

@ -93,7 +93,7 @@ public class ServerConnectionHandler implements Runnable {
ex.printStackTrace(); ex.printStackTrace();
System.exit(1); System.exit(1);
} }
Player newPlayerObject = new Player(); Player newPlayerObject = new Player(this);
Globals.playerManager.addPlayer(newPlayerObject); Globals.playerManager.addPlayer(newPlayerObject);
//spawn player in world //spawn player in world
Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("Human"); Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("Human");
@ -104,6 +104,7 @@ public class ServerConnectionHandler implements Runnable {
newPlayerObject.setWorldX(Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.x)); newPlayerObject.setWorldX(Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.x));
newPlayerObject.setWorldY(Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.z)); newPlayerObject.setWorldY(Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.z));
Globals.dataCellManager.addPlayer(newPlayerObject); Globals.dataCellManager.addPlayer(newPlayerObject);
Globals.dataCellManager.movePlayer(newPlayerObject, Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.x), Globals.serverWorldData.convertRealToChunkSpace(Globals.spawnPoint.z));
//spawn player sword //spawn player sword
Entity sword = ItemUtils.spawnBasicItem("Katana"); Entity sword = ItemUtils.spawnBasicItem("Katana");
AttachUtils.attachEntityToEntityAtBone(newPlayerCharacter, sword, "Bone.031"); AttachUtils.attachEntityToEntityAtBone(newPlayerCharacter, sword, "Bone.031");