Begin implementation of CheckStyle style checking
By: md_5 <git@md-5.net>
This commit is contained in:
@@ -279,16 +279,15 @@
|
||||
this.releaseShoulderEntities();
|
||||
- if (!this.isSpectator()) {
|
||||
- this.d(damagesource);
|
||||
- }
|
||||
+ // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
|
||||
+ if (!event.getKeepInventory()) {
|
||||
+ this.inventory.clear();
|
||||
+ }
|
||||
+
|
||||
+ this.setSpectatorTarget(this); // Remove spectated target
|
||||
+ // CraftBukkit end
|
||||
}
|
||||
|
||||
- this.getScoreboard().getObjectivesForCriteria(IScoreboardCriteria.DEATH_COUNT, this.getName(), ScoreboardScore::incrementScore);
|
||||
+ this.setSpectatorTarget(this); // Remove spectated target
|
||||
+ // CraftBukkit end
|
||||
+
|
||||
+ // CraftBukkit - Get our scores instead
|
||||
+ this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.DEATH_COUNT, this.getName(), ScoreboardScore::incrementScore);
|
||||
EntityLiving entityliving = this.getKillingEntity();
|
||||
|
||||
Reference in New Issue
Block a user