From 1e04eafdc28ad8c10116303fc37104de75c9930c Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 22 Apr 2020 01:49:36 -0300
Subject: [PATCH] 1.16 fixes

---
 src/main/java/carpet/script/value/EntityValue.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java
index 01591a94..56808b73 100644
--- a/src/main/java/carpet/script/value/EntityValue.java
+++ b/src/main/java/carpet/script/value/EntityValue.java
@@ -537,12 +537,12 @@ public class EntityValue extends Value
             if (health <= 0f && e instanceof ServerPlayerEntity)
             {
                 ServerPlayerEntity player = (ServerPlayerEntity) e;
-                if (player.container != null)
+                if (player.currentScreenHandler != null)
                 {
                     // if player dies with open container, then that causes NPE on the client side
                     // its a client side bug that may never surface unless vanilla gets into scripting at some point
                     // bug: #228
-                    player.closeContainer();
+                    player.closeHandledScreen();
                 }
                 ((LivingEntity) e).setHealth(health);
             }