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

10
paper-server/nms-patches/EntityLiving.patch
View File

@@ -99,7 +99,7 @@
@@ -274,19 +323,19 @@
protected void bM() {
protected void bO() {
++this.deathTicks;
- if (this.deathTicks == 20) {
+ if (this.deathTicks >= 20 && !this.dead) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
@@ -587,12 +587,12 @@
+ return this.isAlive() && !this.m_() && this.collides; // CraftBukkit
}
protected void av() {
protected void ax() {
@@ -2072,7 +2357,27 @@
protected void v() {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
this.b(this.activeItem, 16);
- this.a(this.cF(), this.activeItem.a(this.world, this));
- this.a(this.cH(), this.activeItem.a(this.world, this));
+ // CraftBukkit start - fire PlayerItemConsumeEvent
+ ItemStack itemstack;
+ if (this instanceof EntityPlayer) {
@@ -612,9 +612,9 @@
+ itemstack = this.activeItem.a(this.world, this);
+ }
+
+ this.a(this.cF(), itemstack);
+ this.a(this.cH(), itemstack);
+ // CraftBukkit end
this.cL();
this.cN();
}
@@ -2151,10 +2456,18 @@