Fix entity data saving
This commit is contained in:
parent
93f0b27e21
commit
a53d1f808f
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -110,7 +110,6 @@ public class VFSSaveHandler implements ISaveHandler, IPlayerFileData {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writePlayerData(EntityPlayer var1) {
|
public void writePlayerData(EntityPlayer var1) {
|
||||||
System.out.println("writing player data...");
|
|
||||||
NBTTagCompound var2 = new NBTTagCompound();
|
NBTTagCompound var2 = new NBTTagCompound();
|
||||||
var1.writeToNBT(var2);
|
var1.writeToNBT(var2);
|
||||||
|
|
||||||
|
@ -137,7 +136,6 @@ public class VFSSaveHandler implements ISaveHandler, IPlayerFileData {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NBTTagCompound readPlayerData(EntityPlayer var1) {
|
public NBTTagCompound readPlayerData(EntityPlayer var1) {
|
||||||
System.out.println("trying to read player data");
|
|
||||||
VFile playerData = new VFile(worldDirectory, "player", var1.username.toLowerCase() + ".dat");
|
VFile playerData = new VFile(worldDirectory, "player", var1.username.toLowerCase() + ".dat");
|
||||||
|
|
||||||
NBTTagCompound ret = null;
|
NBTTagCompound ret = null;
|
||||||
|
|
|
@ -488,8 +488,8 @@ public abstract class EntityLivingBase extends Entity
|
||||||
}
|
}
|
||||||
|
|
||||||
par1NBTTagCompound.setTag("DropChances", var6);
|
par1NBTTagCompound.setTag("DropChances", var6);
|
||||||
par1NBTTagCompound.setString("CustomName", this.func_94057_bL());
|
// par1NBTTagCompound.setString("CustomName", this.func_94057_bL());
|
||||||
par1NBTTagCompound.setBoolean("CustomNameVisible", this.func_94062_bN());
|
// par1NBTTagCompound.setBoolean("CustomNameVisible", this.func_94062_bN());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -804,6 +804,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
|
||||||
*/
|
*/
|
||||||
public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound)
|
public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound)
|
||||||
{
|
{
|
||||||
|
System.out.println("reading player data from NBT");
|
||||||
super.readEntityFromNBT(par1NBTTagCompound);
|
super.readEntityFromNBT(par1NBTTagCompound);
|
||||||
NBTTagList var2 = par1NBTTagCompound.getTagList("Inventory");
|
NBTTagList var2 = par1NBTTagCompound.getTagList("Inventory");
|
||||||
this.inventory.readFromNBT(var2);
|
this.inventory.readFromNBT(var2);
|
||||||
|
|
|
@ -559,7 +559,6 @@ public class NetServerHandler extends NetHandler
|
||||||
|
|
||||||
public void handleBlockItemSwitch(Packet16BlockItemSwitch par1Packet16BlockItemSwitch)
|
public void handleBlockItemSwitch(Packet16BlockItemSwitch par1Packet16BlockItemSwitch)
|
||||||
{
|
{
|
||||||
System.out.println("handleBlockItemSwitch");
|
|
||||||
if (par1Packet16BlockItemSwitch.id >= 0 && par1Packet16BlockItemSwitch.id < InventoryPlayer.getHotbarSize())
|
if (par1Packet16BlockItemSwitch.id >= 0 && par1Packet16BlockItemSwitch.id < InventoryPlayer.getHotbarSize())
|
||||||
{
|
{
|
||||||
this.playerEntity.inventory.currentItem = par1Packet16BlockItemSwitch.id;
|
this.playerEntity.inventory.currentItem = par1Packet16BlockItemSwitch.id;
|
||||||
|
@ -766,9 +765,6 @@ public class NetServerHandler extends NetHandler
|
||||||
this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, 0, false);
|
this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, 0, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
System.out.println("this should be processed by netloginhandler!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -894,38 +894,38 @@ public abstract class ServerConfigurationManager
|
||||||
/**
|
/**
|
||||||
* Returns an array of usernames for which player.dat exists for.
|
* Returns an array of usernames for which player.dat exists for.
|
||||||
*/
|
*/
|
||||||
public String[] getAvailablePlayerDat()
|
// public String[] getAvailablePlayerDat()
|
||||||
{
|
// {
|
||||||
return this.mcServer.worldServers[0].getSaveHandler().getSaveHandler().getAvailablePlayerDat();
|
// return this.mcServer.worldServers[0].getSaveHandler().getSaveHandler().getAvailablePlayerDat();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public boolean isWhiteListEnabled()
|
// public boolean isWhiteListEnabled()
|
||||||
{
|
// {
|
||||||
return this.whiteListEnforced;
|
// return this.whiteListEnforced;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setWhiteListEnabled(boolean par1)
|
// public void setWhiteListEnabled(boolean par1)
|
||||||
{
|
// {
|
||||||
this.whiteListEnforced = par1;
|
// this.whiteListEnforced = par1;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public List getPlayerList(String par1Str)
|
// public List getPlayerList(String par1Str)
|
||||||
{
|
// {
|
||||||
ArrayList var2 = new ArrayList();
|
// ArrayList var2 = new ArrayList();
|
||||||
Iterator var3 = this.playerEntityList.iterator();
|
// Iterator var3 = this.playerEntityList.iterator();
|
||||||
|
//
|
||||||
while (var3.hasNext())
|
// while (var3.hasNext())
|
||||||
{
|
// {
|
||||||
EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
|
// EntityPlayerMP var4 = (EntityPlayerMP)var3.next();
|
||||||
|
//
|
||||||
if (var4.getPlayerIP().equals(par1Str))
|
// if (var4.getPlayerIP().equals(par1Str))
|
||||||
{
|
// {
|
||||||
var2.add(var4);
|
// var2.add(var4);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
return var2;
|
// return var2;
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the View Distance.
|
* Gets the View Distance.
|
||||||
|
|
Loading…
Reference in New Issue