Merge changes from ALPHA11 for 1.2.13

This commit is contained in:
Dylan K. Taylor
2018-04-04 11:31:39 +01:00
28 changed files with 415 additions and 283 deletions

View File

@ -54,9 +54,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
public const DATA_PLAYER_FLAG_SLEEP = 1;
public const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK
public const DATA_PLAYER_FLAGS = 27;
public const DATA_PLAYER_FLAGS = 26;
public const DATA_PLAYER_BED_POSITION = 29;
public const DATA_PLAYER_BED_POSITION = 28;
/** @var PlayerInventory */
protected $inventory;