mirror of
https://github.com/PaperMC/Folia.git
synced 2024-10-22 08:10:04 +02:00
50 lines
3.0 KiB
Diff
50 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Fri, 31 Mar 2023 20:40:28 -0700
|
|
Subject: [PATCH] MC-Dev fixes
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/Brain.java b/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
index afbb027021acfbe25d534a84f1750e420bbde6e0..af6f91c66e9cc7e0d491e6efed992a140947155e 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
@@ -79,7 +79,7 @@ public class Brain<E extends LivingEntity> {
|
|
}
|
|
|
|
public <T> DataResult<Brain<E>> decode(DynamicOps<T> dynamicOps, MapLike<T> mapLike) {
|
|
- MutableObject<DataResult<Builder<Brain.MemoryValue<?>>>> mutableObject = new MutableObject<>(
|
|
+ MutableObject<DataResult<Builder<Brain.MemoryValue<?>>>> mutableObject2 = new MutableObject<>( // Folia - decompile fix
|
|
DataResult.success(ImmutableList.builder())
|
|
);
|
|
mapLike.entries()
|
|
@@ -91,10 +91,10 @@ public class Brain<E extends LivingEntity> {
|
|
DataResult<? extends Brain.MemoryValue<?>> dataResult2 = dataResult.flatMap(
|
|
memoryType -> this.captureRead((MemoryModuleType<T>)memoryType, dynamicOps, (T)pair.getSecond())
|
|
);
|
|
- mutableObject.setValue(mutableObject.getValue().apply2(Builder::add, dataResult2));
|
|
+ mutableObject2.setValue(mutableObject2.getValue().apply2(Builder::add, dataResult2)); // Folia - decompile fix
|
|
}
|
|
);
|
|
- ImmutableList<Brain.MemoryValue<?>> immutableList = mutableObject.getValue()
|
|
+ ImmutableList<Brain.MemoryValue<?>> immutableList = mutableObject2.getValue() // Folia - decompile fix
|
|
.resultOrPartial(Brain.LOGGER::error)
|
|
.map(Builder::build)
|
|
.orElseGet(ImmutableList::of);
|
|
@@ -194,14 +194,14 @@ public class Brain<E extends LivingEntity> {
|
|
if (optional == null) {
|
|
throw new IllegalStateException("Unregistered memory fetched: " + type);
|
|
} else {
|
|
- return optional.map(ExpirableValue::getValue);
|
|
+ return (Optional<U>)optional.map(ExpirableValue::getValue); // Folia - decompile fix
|
|
}
|
|
}
|
|
|
|
@Nullable
|
|
public <U> Optional<U> getMemoryInternal(MemoryModuleType<U> type) {
|
|
Optional<? extends ExpirableValue<?>> optional = this.memories.get(type);
|
|
- return optional == null ? null : optional.map(ExpirableValue::getValue);
|
|
+ return optional == null ? null : (Optional<U>)optional.map(ExpirableValue::getValue); // Folia - decompile fix
|
|
}
|
|
|
|
public <U> long getTimeUntilExpiry(MemoryModuleType<U> type) {
|