Rebuild all patches using the new rebuild pattern
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From fe881f4cdb74409b6af489ccebf374bee6c1e620 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MiniDigger <admin@minidigger.me>
|
||||
Date: Fri, 3 Jan 2020 16:26:19 +0100
|
||||
Subject: [PATCH] Implement Mob Goal API
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index bc8438ae1ae..0c0051f7f2a 100644
|
||||
index bc8438ae1ae939be4d2257d37df9a843a13ac301..0c0051f7f2a58d63b851e80b442acbb47ca75dfa 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -122,6 +122,13 @@
|
||||
@@ -24,7 +24,7 @@ index bc8438ae1ae..0c0051f7f2a 100644
|
||||
<repositories>
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
|
||||
new file mode 100644
|
||||
index 00000000000..d6ee9410786
|
||||
index 0000000000000000000000000000000000000000..d6ee9410786006be0ffe137c7c0aa4a34e0a3025
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
|
||||
@@ -0,0 +1,329 @@
|
||||
@@ -359,7 +359,7 @@ index 00000000000..d6ee9410786
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
|
||||
new file mode 100644
|
||||
index 00000000000..8e4dc2708d7
|
||||
index 0000000000000000000000000000000000000000..8e4dc2708d71edcb8f32bb72a64f3c493052c2a8
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
|
||||
@@ -0,0 +1,52 @@
|
||||
@@ -417,7 +417,7 @@ index 00000000000..8e4dc2708d7
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
|
||||
new file mode 100644
|
||||
index 00000000000..d9df0236e82
|
||||
index 0000000000000000000000000000000000000000..d9df0236e8224d54587bbeac856a4d125f25f865
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
|
||||
@@ -0,0 +1,236 @@
|
||||
@@ -659,7 +659,7 @@ index 00000000000..d9df0236e82
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
|
||||
new file mode 100644
|
||||
index 00000000000..263e8c65b9e
|
||||
index 0000000000000000000000000000000000000000..263e8c65b9e108bafb03638b3c27dd065eab86ee
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
|
||||
@@ -0,0 +1,63 @@
|
||||
@@ -727,7 +727,7 @@ index 00000000000..263e8c65b9e
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
|
||||
index 9df0006c1a2..b3329c6fcd6 100644
|
||||
index 9df0006c1a283f77c4d01d9fce9062fc1c9bbb1f..b3329c6fcd6758a781a51f5ba8f5052ac1c77b49 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
|
||||
@@ -64,4 +64,8 @@ public final class OptimizedSmallEnumSet<E extends Enum<E>> {
|
||||
@@ -740,7 +740,7 @@ index 9df0006c1a2..b3329c6fcd6 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
|
||||
index 93009d83f07..2dfbecf3905 100644
|
||||
index 93009d83f07bdaf7bc424ffb99cbfe716ca0d66d..2dfbecf3905d9b3712dab240bba5dda3f11d5312 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
|
||||
@@ -10,9 +10,9 @@ public abstract class PathfinderGoal {
|
||||
@@ -776,7 +776,7 @@ index 93009d83f07..2dfbecf3905 100644
|
||||
this.goalTypes.clear();
|
||||
this.goalTypes.addAllUnchecked(enumset);
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
|
||||
index 84d2abbcb90..a68fc11ec66 100644
|
||||
index 84d2abbcb90eb09a19fa0922cfc053c74f8c56e4..a68fc11ec668576d1453459666caeacf5fbc49b8 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
|
||||
@@ -26,7 +26,7 @@ public class PathfinderGoalSelector {
|
||||
@@ -815,7 +815,7 @@ index 84d2abbcb90..a68fc11ec66 100644
|
||||
return this.d.stream().filter(PathfinderGoalWrapped::g);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
|
||||
index 1b800c558f0..dee4e2beacb 100644
|
||||
index 1b800c558f0988ffc0270b86d1a59ea3bb245116..dee4e2beacb1bbb179f220ed186e873bef718340 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
|
||||
@@ -5,8 +5,8 @@ import javax.annotation.Nullable;
|
||||
@@ -830,7 +830,7 @@ index 1b800c558f0..dee4e2beacb 100644
|
||||
|
||||
public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 1647c09756e..b89f99a66fe 100644
|
||||
index 1647c09756ed303a3f3e879e877b5b3de639f843..b89f99a66fe2ab9ad4c956c38c9e4b1d79716c9c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2230,5 +2230,11 @@ public final class CraftServer implements Server {
|
||||
@@ -847,7 +847,7 @@ index 1647c09756e..b89f99a66fe 100644
|
||||
}
|
||||
diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
|
||||
new file mode 100644
|
||||
index 00000000000..83d34761d91
|
||||
index 0000000000000000000000000000000000000000..83d34761d9197fa21cabe6d5859f0123bdda20bb
|
||||
--- /dev/null
|
||||
+++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
|
||||
@@ -0,0 +1,92 @@
|
||||
@@ -943,6 +943,3 @@ index 00000000000..83d34761d91
|
||||
+ if (shouldFail) Assert.fail("See above");
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user