1.4.1

BTW-Community · Aug 16, 2022 · bce2aee · bce2aee
1 parent eb5df67
commit bce2aee
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 21 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,13 @@
+## Version 1.4.1 ##
+Thanks to the following people who contributed to this release!
+- Dawnraider
+- Sockthing
+
+/--Gameplay--/
+- Fixed an issue where the game would crash when fishing
+- Fixed an issue where beds did not properly speed up time
+- Fixed an issue where the corpse eye was missing its texture
+
 ## Version 1.4.0 ##
 Thanks to the following people who contributed to this release!
 - Hiracho

diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
@@ -66,7 +66,7 @@
 +    	for (int i = 0; i < this.worldServers.length; i++) {
 +    		WorldServer world = this.worldServers[i];
 +    		
-+    		if (world != null && !world.areAllPlayersAsleep()) {
++    		if (world != null && !world.areAllPlayersAsleep() && !world.playerEntities.isEmpty()) {
 +    			allPlayersSleeping = false;
 +    			break;
  }

diff --git a/patches/minecraft/net/minecraft/src/FCBetterThanWolves.java.patch b/patches/minecraft/net/minecraft/src/FCBetterThanWolves.java.patch
@@ -25,7 +25,7 @@
 +
 +public class FCBetterThanWolves extends FCAddOn
 +{
-+	public static final String fcVersionString = "1.4.0";
++	public static final String fcVersionString = "1.4.1";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/patches/minecraft/net/minecraft/src/FCItemFishingRod.java.patch b/patches/minecraft/net/minecraft/src/FCItemFishingRod.java.patch
@@ -55,11 +55,11 @@
 +        return func_94597_g();
 +    }
 +    
-+	@Override
-+	public Icon getAnimationIcon(EntityPlayer player) {
-+		if (player.getHeldItem().itemID == this.itemID && player.fishEntity != null) {
-+			return GetCastIcon();
-+		}
-+		else return itemIcon;
-+	}
++    @Override
++    public Icon getAnimationIcon(EntityPlayer player) {
++    	if (player.getHeldItem() != null && player.getHeldItem().itemID == this.itemID && player.fishEntity != null) {
++    		return GetCastIcon();
++    	}
++    	else return itemIcon;
++    }
 +}
diff --git a/patches/minecraft/net/minecraft/src/FCItemFishingRodBaited.java.patch b/patches/minecraft/net/minecraft/src/FCItemFishingRodBaited.java.patch
@@ -59,11 +59,11 @@
 +    
 +	//----------- Client Side Functionality -----------//
 +
-+	@Override
-+	public Icon getAnimationIcon(EntityPlayer player) {
-+		if (player.getHeldItem().itemID == this.itemID && player.fishEntity != null) {
-+			return GetCastIcon();
-+		}
-+		else return itemIcon;
-+	}
++    @Override
++    public Icon getAnimationIcon(EntityPlayer player) {
++    	if (player.getHeldItem() != null && player.getHeldItem().itemID == this.itemID && player.fishEntity != null) {
++    		return GetCastIcon();
++    	}
++    	else return itemIcon;
++    }
 +}
diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
@@ -16,16 +16,16 @@
 +    
 +    public boolean areAllPlayersAsleep() {
 +    	boolean allPlayersSleeping = true;
-+
++    	
 +    	for (int i = 0; i < this.worldServers.length; i++) {
 +    		WorldServer world = this.worldServers[i];
-+
-+    		if (world != null && !world.areAllPlayersAsleep()) {
++    		
++    		if (world != null && !world.areAllPlayersAsleep() && !world.playerEntities.isEmpty()) {
 +    			allPlayersSleeping = false;
 +    			break;
  }
 +    	}
-+
++    	
 +    	return allPlayersSleeping;
 +    }
 +}
diff --git a/patches/minecraft_server/net/minecraft/src/FCBetterThanWolves.java.patch b/patches/minecraft_server/net/minecraft/src/FCBetterThanWolves.java.patch
@@ -22,7 +22,7 @@
 +
 +public class FCBetterThanWolves extends FCAddOn
 +{
-+	public static final String fcVersionString = "1.4.0";
++	public static final String fcVersionString = "1.4.1";
 +
 +	public static FCBetterThanWolves m_instance = new FCBetterThanWolves();
 +

diff --git a/resources/textures/items/fcCorpseEye.png → resources/textures/items/fcItemCorpseEye.png b/resources/textures/items/fcCorpseEye.png → resources/textures/items/fcItemCorpseEye.png