mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-06 23:22:10 -07:00
Update to Minecraft 1.12-pre2
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
@@ -54,9 +56,12 @@
|
||||
this.die();
|
||||
} else {
|
||||
super.A_();
|
||||
super.B_();
|
||||
- if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
|
||||
- --this.pickupDelay;
|
||||
- }
|
||||
@@ -42,7 +42,7 @@
|
||||
}
|
||||
+ // Craftbukkit end */
|
||||
|
||||
this.ak();
|
||||
this.aq();
|
||||
if (!this.world.isClientSide) {
|
||||
@@ -121,6 +128,12 @@
|
||||
}
|
||||
@@ -74,7 +74,7 @@
|
||||
+ return false;
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
this.ap();
|
||||
this.av();
|
||||
this.f = (int) ((float) this.f - f);
|
||||
if (this.f <= 0) {
|
||||
@@ -270,6 +289,26 @@
|
||||
@@ -102,5 +102,5 @@
|
||||
+ // CraftBukkit end
|
||||
+
|
||||
if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) {
|
||||
if (item == Item.getItemOf(Blocks.LOG)) {
|
||||
entityhuman.b((Statistic) AchievementList.g);
|
||||
entityhuman.receive(this, i);
|
||||
if (itemstack.isEmpty()) {
|
||||
|
Reference in New Issue
Block a user