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

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-06 10:00:00 +11:00
parent e9e6bec4e5
commit 102dee7d4f
123 changed files with 393 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
protected static final IAttribute c = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
@@ -21,6 +30,7 @@
private int bJ;
private int drownedConversionTime;
private float bK;
private float bL;
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
@@ -28,15 +28,15 @@
public void tick() {
if (!this.world.isClientSide) {
- if (this.dG()) {
- --this.bJ;
- if (this.isDrownConverting()) {
- --this.drownedConversionTime;
+ // CraftBukkit start - Use wall time instead of ticks for conversion
+ if (this.dG() && this.isAlive()) {
+ if (this.isDrownConverting() && this.isAlive()) {
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+ this.lastTick = MinecraftServer.currentTick;
+ this.bJ -= elapsedTicks;
+ this.drownedConversionTime -= elapsedTicks;
+ // CraftBukkit end
if (this.bJ < 0) {
if (this.drownedConversionTime < 0) {
this.dE();
}
@@ -182,7 +196,14 @@