SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.12

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-06-08 18:00:00 +10:00
parent 7b45ff54ad
commit ea595a5dcf
32 changed files with 65 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/Entity.patch
View File

@@ -111,7 +111,7 @@
+
+ if (this.al++ >= i) {
+ this.al = i;
+ this.portalCooldown = this.aK();
+ this.portalCooldown = this.aM();
+ byte b0;
+
+ if (this.world.worldProvider.getDimensionManager().getDimensionID() == -1) {
@@ -144,7 +144,7 @@
+
public void Y() {
this.world.methodProfiler.a("entityBaseTick");
if (this.isPassenger() && this.bH().dead) {
if (this.isPassenger() && this.bJ().dead) {
@@ -246,6 +361,8 @@
this.lastZ = this.locZ;
this.lastPitch = this.pitch;
@@ -439,7 +439,7 @@
entityitem.q();
@@ -1589,6 +1863,24 @@
if (entity.bH() != this) {
if (entity.bJ() != this) {
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
+ // CraftBukkit start
@@ -460,11 +460,11 @@
+ }
+ }
+ // CraftBukkit end
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bC() instanceof EntityHuman)) {
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bE() instanceof EntityHuman)) {
this.passengers.add(0, entity);
} else {
@@ -1602,6 +1894,22 @@
if (entity.bH() == this) {
if (entity.bJ() == this) {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
+ // CraftBukkit start
@@ -705,7 +705,7 @@
public float getHeadHeight() {
@@ -2295,7 +2728,7 @@
for (Iterator iterator = this.bD().iterator(); iterator.hasNext(); entity.a(oclass, set)) {
for (Iterator iterator = this.bF().iterator(); iterator.hasNext(); entity.a(oclass, set)) {
entity = (Entity) iterator.next();
if (oclass.isAssignableFrom(entity.getClass())) {
- set.add(entity);