From 4299aa22ffcc7770499b5edc4ec330da042a5eb8 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 28 Jan 2013 18:12:29 -0800 Subject: [PATCH] Change WorldServer.allPlayersSleeping to public, and remove the SideOnly annotation on EntityPlayer.getSleepTimer() Closes #393 --- common/forge_at.cfg | 1 + .../entity/player/EntityPlayer.java.patch | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/common/forge_at.cfg b/common/forge_at.cfg index 0ec7c1cc8e..660c5736c8 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -126,6 +126,7 @@ public yc.o #FD:World/field_73018_p #prevThunderingStrength public ayp.b(Llq;)V #MD:WorldClient/func_72847_b #releaseEntitySkin #WorldServer public in.b(Llq;)V #MD:WorldServer/func_72847_b #releaseEntitySkin +public in.N #FD:WorldServer/field_73068_P #allPlayersSleeping # ChunkCache public ys.e # FD:ChunkCache/field_72815_e # worldObj # InventoryLargeChest diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 7e5e7055bb..2e93c85602 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -314,7 +314,15 @@ switch (var2) { -@@ -1846,7 +1953,7 @@ +@@ -1571,7 +1678,6 @@ + return this.sleeping && this.sleepTimer >= 100; + } + +- @SideOnly(Side.CLIENT) + public int getSleepTimer() + { + return this.sleepTimer; +@@ -1846,7 +1952,7 @@ { if (par1ItemStack.getItem().requiresMultipleRenderPasses()) { @@ -323,7 +331,7 @@ } if (this.itemInUse != null && par1ItemStack.itemID == Item.bow.itemID) -@@ -1868,6 +1975,7 @@ +@@ -1868,6 +1974,7 @@ return 101; } } @@ -331,7 +339,7 @@ } return var3; -@@ -2088,6 +2196,14 @@ +@@ -2088,6 +2195,14 @@ } this.theInventoryEnderChest = par1EntityPlayer.theInventoryEnderChest;