Fix edgecase in vines, update config and Readme

pmdevita · pmdevita · commit da6d38d2e26e · 2021-02-22T15:26:54.000-05:00
diff --git a/README.md b/README.md
@@ -11,20 +11,27 @@ for the original idea and name!
 # Setup/Installation
 
 Download the latest release and place it in your plugins folder. The config.yml is generated the first 
-time the plugin is run with the server. You can also look at it 
+time the plugin is run on the server. You can also look at it 
 [here](https://github.com/pmdevita/CreeperHeal2/blob/master/src/main/resources/config.yml).
 
 New versions of Minecraft past the currently supported version do work, with the exception that newly 
 added blocks may not repair properly.
 
+# Commands and Permissions
+
+- `/ch warp` - `creeperheal2.warp` Immediately heal all currently tracked explosions
+- `/ch stats` - `creeperheal2.stats` View stats about currently tracked explosions
+- `/ch cancel` - `creeperheal2.cancel` Cancel replacement of currently tracked explosions (you will lose blocks so be careful)
+
+
 # Development Progress
 
 This plugin is still in beta and while I would consider it safer than the original on 
 modern servers, and it supports every block except those listed below, it still may fail to 
 replace some structures with 100% accuracy. Blocks that aren't replaced properly should drop as
 items though.
 
-Currently, the following blocks can not be replaced properly (they will drop as items)
+Currently, the following blocks cannot be replaced properly (they will drop as items)
 - Paintings
 - Item frames
 - Chorus plants
diff --git a/src/main/kotlin/net/pdevita/creeperheal2/utils/FindDependentBlock.kt b/src/main/kotlin/net/pdevita/creeperheal2/utils/FindDependentBlock.kt
@@ -50,12 +50,18 @@ object OnTopOf: FindDependentBlock {
 
 object Vine: FindDependentBlock {
     override fun reorient(state: BlockState): Location? {
+        // Try to attach to a vine above first
+        if (state.block.getRelative(BlockFace.UP).blockData.material == Material.VINE) {
+            return state.block.getRelative(BlockFace.UP).location
+        }
+        // Otherwise try attaching to one of it's attached faces
         val multipleFacing = state.blockData as MultipleFacing
         for (face in multipleFacing.faces) {
             if (state.block.getRelative(face).blockData.material != Material.AIR) {
                 return state.block.getRelative(face).location
             }
         }
+        // Otherwise attach to block above
         if (state.block.getRelative(BlockFace.UP).blockData.material != Material.AIR) {
             return state.block.getRelative(BlockFace.UP).location
         }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -31,7 +31,7 @@ turbo-type: 0
 
 # Constant Amount Turbo Settings
 # The number of blocks to replace in each replacement cycle (For reference, non-turbo is 1)
-# Raising this will slightly increase TPS impact
+# Raising this will slightly increase visible lag. Recommended <20
 turbo-amount: 3
 
 # Percentage Turbo Settings

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,18 @@ object OnTopOf: FindDependentBlock {`
`50`	`50`
`51`	`51`	`object Vine: FindDependentBlock {`
`52`	`52`	`override fun reorient(state: BlockState): Location? {`
	`53`	`+ // Try to attach to a vine above first`
	`54`	`+ if (state.block.getRelative(BlockFace.UP).blockData.material == Material.VINE) {`
	`55`	`+ return state.block.getRelative(BlockFace.UP).location`
	`56`	`+ }`
	`57`	`+ // Otherwise try attaching to one of it's attached faces`
`53`	`58`	`val multipleFacing = state.blockData as MultipleFacing`
`54`	`59`	`for (face in multipleFacing.faces) {`
`55`	`60`	`if (state.block.getRelative(face).blockData.material != Material.AIR) {`
`56`	`61`	`return state.block.getRelative(face).location`
`57`	`62`	`}`
`58`	`63`	`}`
	`64`	`+ // Otherwise attach to block above`
`59`	`65`	`if (state.block.getRelative(BlockFace.UP).blockData.material != Material.AIR) {`
`60`	`66`	`return state.block.getRelative(BlockFace.UP).location`
`61`	`67`	`}`