Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 10:27:55 +01:00
Code Issues Projects Releases Wiki Activity

Implemented new PlayerDeathEvent methods for exp setting

Browse Source
This commit is contained in:
Nathan Adams 2012-01-14 18:08:27 +00:00
parent 548ccabe2f
commit 2ab160e484
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@ -65,6 +65,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public String listName;
public org.bukkit.Location compassTarget;
public int newExp = 0;
public int newLevel = 0;
public int newTotalExp = 0;
public boolean keepLevel = false;
// CraftBukkit end
public void a(NBTTagCompound nbttagcompound) {
@ -553,6 +556,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void t_() {
this.cf = -99999999;
this.lastSentExp = -1; // CraftBukkit - Added to reset
}
public void a(String s) {
@ -627,18 +631,30 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void reset() {
float exp = 0;
if(this.keepLevel) {
exp = this.exp;
this.newTotalExp = this.expTotal;
this.newLevel = this.expLevel;
}
this.health = 20;
this.fireTicks = 0;
this.fallDistance = 0;
this.foodData = new FoodMetaData();
this.expLevel = 0;
this.expTotal = 0;
this.expLevel = this.newLevel;
this.expTotal = this.newTotalExp;
this.exp = 0;
this.deathTicks = 0;
effects.clear();
this.activeContainer = this.defaultContainer;
this.lastSentExp = -1; // lastSentExp. Find line: "if (this.expTotal != this.XXXX) {"
this.giveExp(this.newExp);
if(this.keepLevel) {
this.exp = exp;
} else {
this.giveExp(this.newExp);
}
this.keepLevel = false;
}
public CraftPlayer getPlayer() {

4
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -330,6 +330,10 @@ public class CraftEventFactory {
org.bukkit.World world = entity.getWorld();
Bukkit.getServer().getPluginManager().callEvent(event);
// TODO: Possibly a way to persist this incase of disconnect
victim.keepLevel = event.getKeepLevel();
victim.newLevel = event.getNewLevel();
victim.newTotalExp = event.getNewTotalExp();
victim.expToDrop = event.getDroppedExp();
victim.newExp = event.getNewExp();