From d9cf5543f11de3e60dcd02c67568d6000721c3b3 Mon Sep 17 00:00:00 2001
From: oilboi <47129783+oilboi@users.noreply.github.com>
Date: Sat, 11 Apr 2020 02:02:39 -0400
Subject: [PATCH] Fix crashing and make water splash pleasant

---
 init.lua         | 12 ++++++++----
 player_input.lua |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/init.lua b/init.lua
index 5491c5d..2637840 100644
--- a/init.lua
+++ b/init.lua
@@ -15,16 +15,20 @@ local old_node
 local in_water = false
 local old_in_water = false
 minetest.register_globalstep(function(dtime)
+	if not minetest.localplayer then
+		return
+	end
+	
+	local vel = minetest.localplayer:get_velocity().y
 	local pos = minetest.localplayer:get_pos()
-	pos.y = pos.y - 0.1
+	
 	local node = minetest.get_node_or_nil(pos)
 	if node then
 		local name = node.name
 		if name == "main:water" or name == "main:water_flowing" then
 			in_water = true
-			
-			if in_water == true and old_in_water == false then
-				minetest.sound_play("splash", {gain = 0.4, pitch = math.random(80,100)/100})
+			if in_water == true and old_in_water == false and vel < 0 then
+				minetest.sound_play("splash", {gain = 0.4, pitch = math.random(80,100)/100, gain = 0.05})
 			end
 		else
 			in_water = false
diff --git a/player_input.lua b/player_input.lua
index cb2f3c5..56932b4 100644
--- a/player_input.lua
+++ b/player_input.lua
@@ -36,7 +36,7 @@ local run_discharge_timer = 0
 local old_up = false
 local sneak = false
 local old_sneak = false
-bunny_hop = false
+local bunny_hop = false
 
 --attempt to tell the server to allow us to run
 local send_server_movement_state = function(state)
@@ -55,6 +55,7 @@ minetest.register_globalstep(function(dtime)
 	if not minetest.localplayer then
 		return
 	end
+	
 	local input = minetest.get_control_bits(minetest.localplayer)
 	local vel = minetest.localplayer:get_velocity().y
 	local oldvel = minetest.localplayer:get_last_velocity().y
-- 
2.44.0