summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/TileEntityBrewingStand.java')
-rw-r--r--src/main/java/net/minecraft/server/TileEntityBrewingStand.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
index be1145f7..e362c26d 100644
--- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
+++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
@@ -17,6 +17,7 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor
private int e;
private int f;
private String g;
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit
public TileEntityBrewingStand() {}
@@ -62,9 +63,14 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor
}
public void h() {
+ // CraftBukkit start - Use wall time instead of ticks for brewing
+ int elapsedTicks = Math.max(1, MinecraftServer.currentTick - this.lastTick);
+ this.lastTick = MinecraftServer.currentTick;
+
if (this.brewTime > 0) {
- --this.brewTime;
- if (this.brewTime == 0) {
+ this.brewTime -= elapsedTicks;
+ if (this.brewTime <= 0) { // == -> <=
+ // CraftBukkit end
this.u();
this.update();
} else if (!this.l()) {