fixed restricting #774

Luke100000 · Oct 31, 2023 · 9670091 · 9670091
1 parent 527a5ac
commit 9670091
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,7 @@
 * Added support for Let's Do Bakery
 * Fixed root advancement to appear on world load
 * Fixed villager marriage limit math
+* You can no longer restrict bells or gravestones, causing them to get stuck
 
 # 7.5.9
 

diff --git a/common/src/main/java/net/mca/network/c2s/ReportBuildingMessage.java b/common/src/main/java/net/mca/network/c2s/ReportBuildingMessage.java
@@ -43,23 +43,26 @@ public void receive(ServerPlayerEntity player) {
             );
             case FORCE_TYPE, REMOVE -> {
                 Optional<Village> village = villages.findNearestVillage(player);
-                Optional<Building> building = village.flatMap(v -> v.getBuildings().values().stream().filter((b) ->
-                        b.containsPos(player.getBlockPos())).findAny());
-                if (building.isPresent()) {
+                Optional<Building> building = village.flatMap(v -> v.getBuildings().values().stream()
+                        .filter(b -> b.containsPos(player.getBlockPos()))
+                        .filter(b -> action != Action.FORCE_TYPE || !b.getBuildingType().grouped())
+                        .findAny());
+                building.ifPresentOrElse(b -> {
                     if (action == Action.FORCE_TYPE) {
-                        if (building.get().getType().equals(data)) {
-                            building.get().setTypeForced(false);
-                            building.get().determineType();
+                        if (b.getType().equals(data)) {
+                            b.setTypeForced(false);
+                            b.determineType();
                         } else {
-                            building.get().setTypeForced(true);
-                            building.get().setType(data);
+                            b.setTypeForced(true);
+                            b.setType(data);
                         }
                     } else {
-                        village.get().removeBuilding(building.get().getId());
+                        //noinspection OptionalGetWithoutIsPresent
+                        village.get().removeBuilding(b.getId());
                     }
-                } else {
+                }, () -> {
                     player.sendMessage(Text.translatable("blueprint.noBuilding"), true);
-                }
+                });
             }
         }
     }