From 7e2f4feaf5246d911206265343bc518097df7513 Mon Sep 17 00:00:00 2001
From: austin <austin@austinwhoover.com>
Date: Sun, 25 Feb 2024 14:27:48 -0500
Subject: [PATCH] terrain editing improvement + animation bugfix

---
 .../electrosphere/entity/state/gravity/ClientGravityTree.java   | 2 +-
 src/main/java/electrosphere/renderer/actor/Actor.java           | 2 +-
 .../electrosphere/server/terrain/editing/TerrainEditing.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
index eae058d9..6ce57495 100644
--- a/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
+++ b/src/main/java/electrosphere/entity/state/gravity/ClientGravityTree.java
@@ -199,7 +199,7 @@ public class ClientGravityTree implements BehaviorTree {
                 break;
             case NOT_ACTIVE:
                 if(hadEntityCollision()){
-                    start();
+                    // start();
                 }
                 //nothing here atm
                 //eventually want to check if need to re-activate somehow
diff --git a/src/main/java/electrosphere/renderer/actor/Actor.java b/src/main/java/electrosphere/renderer/actor/Actor.java
index b07e7670..aa3be23c 100644
--- a/src/main/java/electrosphere/renderer/actor/Actor.java
+++ b/src/main/java/electrosphere/renderer/actor/Actor.java
@@ -109,7 +109,7 @@ public class Actor {
         // playingAnimation = true;
         // animation = animationName;
         Model model = Globals.assetManager.fetchModel(modelPath);
-        if(model != null){
+        if(model != null && model.getAnimation(animationName) != null){
             double length = model.getAnimation(animationName).duration;
             ActorAnimationMask animMask = new ActorAnimationMask(priority, animationName, 0, length);
             for(Bone bone : model.bones){
diff --git a/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java b/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java
index 627897ac..52a311a5 100644
--- a/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java
+++ b/src/main/java/electrosphere/server/terrain/editing/TerrainEditing.java
@@ -62,7 +62,7 @@ public class TerrainEditing {
                 ){
                     float current = data.getWeights()[voxelPos.x][voxelPos.y][voxelPos.z];
                     //hard clamp so it doesn't go over 1
-                    float finalValue = Math.max(Math.min(current + weight,1),-1);
+                    float finalValue = Math.max(Math.min(current + weight * distance,1),-1);
                     voxelCellManager.editChunk(chunkPos, voxelPos, finalValue, type);
                 }
             }