Implemented Bog (Issue #18)

SwingTheVine · Jul 5, 2024 · 4364789 · 4364789
1 parent f8c60f1
commit 4364789
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -27,14 +27,14 @@
 </table>
 
 <h1>QuickSand And Numerous Dungeons (QSAND)</h1>
-<a href="" target="_blank"><img alt="Latest Version" src="https://img.shields.io/badge/Latest_Version-1.8.9--0.86.21-lightblue?style=flat"></a>
+<a href="" target="_blank"><img alt="Latest Version" src="https://img.shields.io/badge/Latest_Version-1.8.9--0.86.24-lightblue?style=flat"></a>
 <a href="https://github.com/SwingTheVine/QSAND-Minecraft/releases" target="_blank"><img alt="Latest Release" src="https://img.shields.io/github/v/release/SwingTheVine/QSAND-Minecraft?sort=date&filter=1.8.9-*&display_name=release&style=flat&label=Latest%20Release&color=blue"></a>
 <a href="https://github.com/SwingTheVine/QSAND-Minecraft/blob/1.8.9/docs/LICENSE.txt" target="_blank"><img alt="Software License: GPL-3.0" src="https://img.shields.io/badge/Software_License-GPL--3.0-brightgreen?style=flat"></a>
 <a href="https://github.com/SwingTheVine/QSAND-Minecraft/blob/1.8.9/docs/LICENSE-MEDIA.txt" target="_blank"><img alt="Media License: CC-BY-SA-4.0" src="https://img.shields.io/badge/Media_License-CC--BY--SA--4.0-orange?style=flat"></a>
 <br>
 <a href="https://discordapp.com/users/394185816370315276" target="_blank"><img alt="Contact Me" src="https://img.shields.io/badge/Contact_Me-gray?style=flat&logo=Discord&logoColor=white&logoSize=auto&labelColor=cornflowerblue"></a>
 <a href="" target="_blank"><img alt="WakaTime" src="https://img.shields.io/badge/Coding_Time-142hrs_52mins-blue?style=flat&logo=wakatime&logoColor=black&logoSize=auto&labelColor=white"></a>
-<a href="" target="_blank"><img alt="Total Patches" src="https://img.shields.io/badge/Total_Patches-393-black?style=flat"></a>
+<a href="" target="_blank"><img alt="Total Patches" src="https://img.shields.io/badge/Total_Patches-396-black?style=flat"></a>
 <a href="" target="_blank"><img alt="Total Lines of Code" src="https://tokei.rs/b1/github/SwingTheVine/QSAND-Minecraft?category=code"></a>
 <a href="" target="_blank"><img alt="Total Comments" src="https://tokei.rs/b1/github/SwingTheVine/QSAND-Minecraft?category=comments"></a>
 <a href="" target="_blank"><img alt="Version Incrementer" src="https://github.com/SwingTheVine/QSAND-Minecraft/actions/workflows/version-incrementer.yml/badge.svg"></a>

diff --git a/src/main/java/com/SwingTheVine/QSAND/ModInfo.java b/src/main/java/com/SwingTheVine/QSAND/ModInfo.java
@@ -19,8 +19,8 @@ public class ModInfo {
 	public static final String description = "This mod adds a large variety of unique quicksands and custom structures to the game.";
 
 	// Updates all mentions of the current version throughout the rest of the project using an Ant
-	public static final String version = "0.86.21";
-	public static final String totalPatches = "393";
+	public static final String version = "0.86.24";
+	public static final String totalPatches = "396";
 
 	public static final String url = "";
 	public static final List<String> authorList = new ArrayList<String>(Arrays.asList("SwingTheVine"));

diff --git a/src/main/java/com/SwingTheVine/QSAND/fluid/FluidBog.java b/src/main/java/com/SwingTheVine/QSAND/fluid/FluidBog.java
@@ -919,13 +919,12 @@ public boolean isNormalCube() {
 	// Checks to see if the entity is fully submerged in the block
 	public void runSubmergedChecks(final Entity triggeringEntity) {
 
-		System.out.println("isDrowning: " + QuicksandManager.isDrowning(triggeringEntity));
 		// If the entity is inside of this block, AND the entity is marked as drowning...
 		if (QuicksandManager.isEntityInsideOfBlock(triggeringEntity, this)
 			&& QuicksandManager.isDrowning(triggeringEntity)) {
-			QuicksandManager.spawnDrowningBubble(triggeringEntity.worldObj, triggeringEntity, this, true); // Spawn drowning
-																											// bubbles
-			System.out.println("isRemote: " + triggeringEntity.worldObj.isRemote);
+
+			// Spawn drowning bubbles
+			QuicksandManager.spawnDrowningBubble(triggeringEntity.worldObj, triggeringEntity, this, true);
 
 			// ...AND the world is NOT on a server, AND the entity is marked as alive...
 			if (!triggeringEntity.worldObj.isRemote && triggeringEntity.isEntityAlive()) {

diff --git a/src/main/java/com/SwingTheVine/QSAND/util/QuicksandManager.java b/src/main/java/com/SwingTheVine/QSAND/util/QuicksandManager.java
@@ -1073,6 +1073,9 @@ public static boolean isDrowning(final Entity entity) {
 
 		final int customDrownAir = getCustomDrownAir(entity); // Obtains the datawatcher value
 
+		System.out.println("customDrownAir: " + customDrownAir);
+		System.out.println("isRemoteDrowning: " + entity.worldObj.isRemote);
+
 		// If the entity is NOT on a server instance...
 		if (!entity.worldObj.isRemote) {
 

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "QSAND",
   "name": "QuickSand And Numerous Dungeons",
   "description": "This mod adds a large variety of unique quicksands and custom structures to the game.",
-  "version": "0.86.21",
+  "version": "0.86.24",
   "mcversion": "1.8.9",
   "url": "",
   "updateUrl": "",