fixed merge

Luke100000 · Feb 4, 2023 · cf849d9 · cf849d9
1 parent 4864558
commit cf849d9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/common/src/main/java/net/mca/entity/ai/GPT3.java b/common/src/main/java/net/mca/entity/ai/GPT3.java
@@ -149,10 +149,6 @@ public static Optional<String> answer(ServerPlayerEntity player, VillagerEntityM
         } catch (Exception e) {
             MCA.LOGGER.error(e);
             player.sendMessage(Text.translatable("mca.ai_broken").formatted(Formatting.RED), false);
-            }
-        } catch (Exception e) {
-            MCA.LOGGER.error(e);
-            player.sendMessage(new TranslatableText("mca.ai_broken").formatted(Formatting.RED), false);
         }
 
         return Optional.empty();

diff --git a/common/src/main/java/net/mca/entity/ai/Residency.java b/common/src/main/java/net/mca/entity/ai/Residency.java
@@ -49,7 +49,7 @@ public BlockPos getWorkplace() {
 
     public void setWorkplace(ServerPlayerEntity player) {
         PointOfInterestStorage pointOfInterestStorage = player.getWorld().getPointOfInterestStorage();
-        pointOfInterestStorage.getNearestPosition(VillagerProfession.NONE.getCompletionCondition(), (a) -> true, entity.getBlockPos(), 8, PointOfInterestStorage.OccupationStatus.HAS_SPACE).ifPresentOrElse(blockPos -> {
+        pointOfInterestStorage.getNearestPosition(VillagerProfession.NONE.acquirableWorkstation(), (a) -> true, entity.getBlockPos(), 8, PointOfInterestStorage.OccupationStatus.HAS_SPACE).ifPresentOrElse(blockPos -> {
                     pointOfInterestStorage.getType(blockPos).ifPresent((pointOfInterestType) -> {
                         pointOfInterestStorage.getPosition(VillagerProfession.NONE.acquirableWorkstation(), (registryEntry, blockPos2) -> {
                             return blockPos2.equals(blockPos);