twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.7

Browse Source
This commit is contained in:
Dinnerbone
2011-06-29 23:02:25 +01:00
parent a98c7ba2c7
commit a679e7f380
67 changed files with 829 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityItem.java
View File

@@ -41,8 +41,8 @@ public class EntityItem extends Entity {
protected void b() {}
public void o_() {
super.o_();
public void m_() {
super.m_();
// CraftBukkit start
int currentTick = (int) (System.currentTimeMillis() / 50);
this.pickupDelay -= (currentTick - this.lastTick);
@@ -96,7 +96,7 @@ public class EntityItem extends Entity {
}
public boolean damageEntity(Entity entity, int i) {
this.ae();
this.af();
this.f -= i;
if (this.f <= 0) {
this.die();