Auto Manager: Use RevEnchant's fortune.

This may have been a bug, but not sure. Was successfully loading Rev's fortune level, but it appears like the default minecraft fortune level may have overwritten it. If so, its now fixed.
PrisonTeam · Sep 6, 2024 · c56343a · c56343a
1 parent a480c01
commit c56343a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/docs/changelog_v3.3.x.md b/docs/changelog_v3.3.x.md
@@ -16,6 +16,11 @@ These change logs represent the work that has been going on within prison.
 
 # 3.3.0-alpha.18d 2024-09-05
 
+
+* **Auto Manager: Use RevEnchant's fortune.**
+This may have been a bug, but not sure.  Was successfully loading Rev's fortune level, but it appears like the default minecraft fortune level may have overwritten it. If so, its now fixed.
+
+
 * **Auto Features: blocking: Fixed a bug where 'blockAllBlocks' was incorrectly using 'smeltAllBlocks'.**
 Fixed.  'blockAllBlocks' now works properly.
 

diff --git a/...on-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/AutoManagerFeatures.java b/...on-spigot/src/main/java/tech/mcprison/prison/spigot/autofeatures/AutoManagerFeatures.java
@@ -445,9 +445,9 @@ protected int getFortune(SpigotItemStack itemInHand, StringBuilder debugInfo ){
 			try {
 				Class.forName( "me.revils.revenchants.api.RevEnchantApi", false, this.getClass().getClassLoader() );
 
-				boolean has1 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag");
-				boolean has2 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag.Enchants");
-				boolean has3 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag.Enchants.Fortune");
+//				boolean has1 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag");
+//				boolean has2 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag.Enchants");
+//				boolean has3 = PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag.Enchants.Fortune");
 
 				if ( RevEnchantsApi.isTool( itemInHand.getBukkitStack() ) && 
 									PrisonNBTUtil.hasNBTInt( itemInHand.getBukkitStack(), "tag.Enchants.Fortune") ) {
@@ -457,6 +457,7 @@ protected int getFortune(SpigotItemStack itemInHand, StringBuilder debugInfo ){
 					if ( fortRevEnchants > -1 ) {
 
 						fortLevel = fortRevEnchants;
+						usedRevEnchantsFortune = true;
 
 						debugInfo.append( "used RevEnchant NBT: level " ).append( fortLevel );
 					}
@@ -466,7 +467,7 @@ protected int getFortune(SpigotItemStack itemInHand, StringBuilder debugInfo ){
 					}
 
 
-					usedRevEnchantsFortune = true;
+//					usedRevEnchantsFortune = true;
 				}
 			}
 			catch ( Exception e ) {
@@ -484,6 +485,7 @@ protected int getFortune(SpigotItemStack itemInHand, StringBuilder debugInfo ){
 
 		try {
 			if ( !usedTEFortune &&
+				 !usedRevEnchantsFortune &&
 					itemInHand != null && 
 					itemInHand.getBukkitStack() != null && 
 					itemInHand.getBukkitStack().containsEnchantment( Enchantment.LOOT_BONUS_BLOCKS ) &&