Mappings Update

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-26 08:00:00 +11:00
parent 239b2828db
commit d7e312278d
120 changed files with 878 additions and 1619 deletions

View File

@@ -64,7 +64,7 @@
+ }
+ // CraftBukkit end
this.c();
object = new PacketPlayOutEntityTeleport(this.tracker);
packet1 = new PacketPlayOutEntityTeleport(this.tracker);
}
@@ -181,6 +205,7 @@
}
@@ -112,7 +112,7 @@
}
@@ -224,6 +270,11 @@
Set set = attributemapserver.getAttributes();
Set<AttributeInstance> set = attributemapserver.getAttributes();
if (!set.isEmpty()) {
+ // CraftBukkit start - Send scaled max health
@@ -138,11 +138,11 @@
+ entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
+ // CraftBukkit end
this.trackedPlayers.add(entityplayer);
Packet packet = this.e();
Packet<?> packet = this.e();
@@ -290,6 +351,12 @@
AttributeMapServer attributemapserver = (AttributeMapServer) ((EntityLiving) this.tracker).getAttributeMap();
Collection collection = attributemapserver.c();
Collection<AttributeInstance> collection = attributemapserver.c();
+ // CraftBukkit start - If sending own attributes send scaled health instead of current maximum health
+ if (this.tracker.getId() == entityplayer.getId()) {