mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 12:13:54 -07:00
Update to Minecraft 1.13
This commit is contained in:
@@ -259,7 +259,7 @@
|
||||
|
||||
this.releaseShoulderEntities();
|
||||
- if (!this.world.getGameRules().getBoolean("keepInventory") && !this.isSpectator()) {
|
||||
- this.di();
|
||||
- this.dj();
|
||||
- this.inventory.q();
|
||||
+ // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
|
||||
+ if (!event.getKeepInventory()) {
|
||||
@@ -274,7 +274,7 @@
|
||||
+ // CraftBukkit - Get our scores instead
|
||||
+ this.world.getServer().getScoreboardManager().getScoreboardScores(IScoreboardCriteria.d, this.getName(), ScoreboardScore::incrementScore);
|
||||
+
|
||||
EntityLiving entityliving = this.cu();
|
||||
EntityLiving entityliving = this.cv();
|
||||
|
||||
if (entityliving != null) {
|
||||
@@ -383,10 +537,12 @@
|
||||
@@ -568,7 +568,7 @@
|
||||
this.locale = packetplayinsettings.b();
|
||||
this.ct = packetplayinsettings.d();
|
||||
this.cu = packetplayinsettings.e();
|
||||
@@ -1039,7 +1288,7 @@
|
||||
@@ -1033,7 +1282,7 @@
|
||||
this.cw = (Entity) (entity == null ? this : entity);
|
||||
if (entity1 != this.cw) {
|
||||
this.playerConnection.sendPacket(new PacketPlayOutCamera(this.cw));
|
||||
@@ -577,7 +577,7 @@
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1066,7 +1315,7 @@
|
||||
@@ -1060,7 +1309,7 @@
|
||||
|
||||
@Nullable
|
||||
public IChatBaseComponent getPlayerListName() {
|
||||
@@ -586,7 +586,7 @@
|
||||
}
|
||||
|
||||
public void a(EnumHand enumhand) {
|
||||
@@ -1083,12 +1332,17 @@
|
||||
@@ -1077,12 +1326,17 @@
|
||||
}
|
||||
|
||||
public void J() {
|
||||
@@ -604,7 +604,7 @@
|
||||
}
|
||||
|
||||
public AdvancementDataPlayer getAdvancementData() {
|
||||
@@ -1100,9 +1354,16 @@
|
||||
@@ -1094,9 +1348,16 @@
|
||||
return this.cD;
|
||||
}
|
||||
|
||||
@@ -621,7 +621,7 @@
|
||||
if (worldserver == this.world) {
|
||||
this.playerConnection.a(d0, d1, d2, f, f1);
|
||||
} else {
|
||||
@@ -1127,6 +1388,149 @@
|
||||
@@ -1121,6 +1382,149 @@
|
||||
this.server.getPlayerList().b(this, worldserver);
|
||||
this.server.getPlayerList().updateClient(this);
|
||||
}
|
||||
|
Reference in New Issue
Block a user