Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

Properly clear attributes on remove and death. Fixes BUKKIT-4416

Browse Source
This commit is contained in:
EvilSeph 2013-07-03 00:23:34 -04:00
parent adcb293a03
commit c00db5f751
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -914,7 +914,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.expTotal = this.newTotalExp;
this.exp = 0;
this.deathTicks = 0;
this.effects.clear();
this.aG(); // Should be removeAllEffects.
this.updateEffects = true;
this.activeContainer = this.defaultContainer;
this.killer = null;

7
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@ -275,12 +275,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public void removePotionEffect(PotionEffectType type) {
getHandle().effects.remove(type.getId());
getHandle().updateEffects = true;
if (getHandle() instanceof EntityPlayer) {
if (((EntityPlayer) getHandle()).playerConnection == null) return;
((EntityPlayer) getHandle()).playerConnection.sendPacket(new Packet42RemoveMobEffect(getHandle().id, new MobEffect(type.getId(), 0, 0)));
}
getHandle().k(type.getId()); // Should be removeEffect.
}
public Collection<PotionEffect> getActivePotionEffects() {