From 957bc4c5cc157710acd2523a5b0caa98b4ae3158 Mon Sep 17 00:00:00 2001
From: shartte <shartte@users.noreply.github.com>
Date: Mon, 31 Aug 2020 23:10:25 +0200
Subject: [PATCH] Fixes removal of facades not invalidating the cached
 server-side collision boxes. (#4663)

---
 src/main/java/appeng/facade/FacadeContainer.java  | 12 +++++++++++-
 src/main/java/appeng/parts/CableBusContainer.java |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java
index 24e8051bc..b1156dbbe 100644
--- a/src/main/java/appeng/facade/FacadeContainer.java
+++ b/src/main/java/appeng/facade/FacadeContainer.java
@@ -37,15 +37,18 @@ public class FacadeContainer implements IFacadeContainer {
 
     private final int facades = 6;
     private final CableBusStorage storage;
+    private final Runnable changeCallback;
 
-    public FacadeContainer(final CableBusStorage cbs) {
+    public FacadeContainer(final CableBusStorage cbs, Runnable changeCallback) {
         this.storage = cbs;
+        this.changeCallback = changeCallback;
     }
 
     @Override
     public boolean addFacade(final IFacadePart a) {
         if (this.getFacade(a.getSide()) == null) {
             this.storage.setFacade(a.getSide().ordinal(), a);
+            this.notifyChange();
             return true;
         }
         return false;
@@ -56,6 +59,7 @@ public class FacadeContainer implements IFacadeContainer {
         if (side != null && side != AEPartLocation.INTERNAL) {
             if (this.storage.getFacade(side.ordinal()) != null) {
                 this.storage.setFacade(side.ordinal(), null);
+                this.notifyChange();
                 if (host != null) {
                     host.markForUpdate();
                 }
@@ -84,6 +88,7 @@ public class FacadeContainer implements IFacadeContainer {
         for (int x = 0; x < this.facades; x++) {
             this.storage.setFacade(x, newFacades[x]);
         }
+        this.notifyChange();
     }
 
     @Override
@@ -175,4 +180,9 @@ public class FacadeContainer implements IFacadeContainer {
         }
         return true;
     }
+
+    private void notifyChange() {
+        this.changeCallback.run();
+    }
+
 }
diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java
index 963f313d9..b2ddc03fb 100644
--- a/src/main/java/appeng/parts/CableBusContainer.java
+++ b/src/main/java/appeng/parts/CableBusContainer.java
@@ -125,7 +125,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
 
     @Override
     public IFacadeContainer getFacadeContainer() {
-        return new FacadeContainer(this);
+        return new FacadeContainer(this, this::invalidateShapes);
     }
 
     @Override