AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

clear injects in RegistryItem after injecting

Browse Source
This commit is contained in:
Bixilon 2021-06-30 15:58:31 +02:00
parent fcd6dca0ce
commit 81e877eb49
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
View File

@ -451,7 +451,7 @@ abstract class Entity(
// ToDo: Play step sound // ToDo: Play step sound
} }
// ToDo: Check for move effect // ToDo: Check for move effect (sounds)
// block collision handling // block collision handling
val aabb = aabb.shrink(0.001) val aabb = aabb.shrink(0.001)
@ -467,7 +467,7 @@ abstract class Entity(
} }
protected fun applyGravity(force: Boolean = false) { protected fun applyGravity(force: Boolean = false) {
if (hasGravity) { if (hasGravity || force) {
velocity.y += -0.04 velocity.y += -0.04
} }
} }

4
src/main/java/de/bixilon/minosoft/data/registries/registry/RegistryItem.kt
View File

@ -14,8 +14,6 @@
package de.bixilon.minosoft.data.registries.registry package de.bixilon.minosoft.data.registries.registry
import de.bixilon.minosoft.data.registries.ResourceLocationAble import de.bixilon.minosoft.data.registries.ResourceLocationAble
import de.bixilon.minosoft.data.registries.blocks.types.Block
import de.bixilon.minosoft.data.registries.items.BlockItem
import de.bixilon.minosoft.data.registries.versions.Registries import de.bixilon.minosoft.data.registries.versions.Registries
import de.bixilon.minosoft.util.KUtil.setValue import de.bixilon.minosoft.util.KUtil.setValue
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@ -49,6 +47,8 @@ abstract class RegistryItem : ResourceLocationAble {
javaField.setValue(this, value) javaField.setValue(this, value)
} }
this::injects.javaField?.setValue(this, null)
} }
open fun postInit(registries: Registries) { } open fun postInit(registries: Registries) { }

2
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -219,7 +219,7 @@ object KUtil {
} }
fun Field.setValue(instance: Any, value: Any) { fun Field.setValue(instance: Any, value: Any?) {
this.isAccessible = true this.isAccessible = true
// ToDo // ToDo