Updated Upstream (CraftBukkit/Spigot)
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
This commit is contained in:
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix Concurrency issue in WeightedList
|
||||
if multiple threads from worldgen sort at same time, it will crash.
|
||||
So make a copy of the list for sorting purposes.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BehaviorGate.java b/src/main/java/net/minecraft/server/BehaviorGate.java
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorGate.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorGate.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BehaviorGate.java
|
||||
+++ b/src/main/java/net/minecraft/server/BehaviorGate.java
|
||||
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorGate.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorGate.java
|
||||
@@ -0,0 +0,0 @@ public class BehaviorGate<E extends EntityLiving> extends Behavior<E> {
|
||||
private final Set<MemoryModuleType<?>> b;
|
||||
private final BehaviorGate.Order c;
|
||||
@@ -40,10 +40,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
this.c = consumer;
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/WeightedList.java b/src/main/java/net/minecraft/server/WeightedList.java
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WeightedList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WeightedList.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/WeightedList.java
|
||||
+++ b/src/main/java/net/minecraft/server/WeightedList.java
|
||||
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/WeightedList.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/WeightedList.java
|
||||
@@ -0,0 +0,0 @@ import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.DataResult;
|
||||
import com.mojang.serialization.Dynamic;
|
||||
|
||||
Reference in New Issue
Block a user