Rebuild patches

This commit is contained in:
BillyGalbreath
2020-12-12 18:19:48 -06:00
parent 0ae637c32d
commit ef0b93df2e
200 changed files with 1040 additions and 1041 deletions

View File

@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 36c8685064b05cce3c63111451906db3138af350 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 18:52:55 -0600
Subject: [PATCH] Cat spawning options
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 0c98a43602..08778cc0de 100644
index 0c98a436021cbdedba5352073b1f8bf9852298eb..08778cc0de9b1ffefc52d12d31403c33c50ddb2f 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -47,6 +47,7 @@ public interface IEntityAccess {
@@ -17,7 +17,7 @@ index 0c98a43602..08778cc0de 100644
return this.a(oclass, axisalignedbb, IEntitySelector.g);
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 5e17868a76..6d0ebd8afe 100644
index 5e17868a76ea8e3f105c11d496d6da12afa0da41..6d0ebd8afe690b3781917773419abe2856009769 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner {
@@ -62,7 +62,7 @@ index 5e17868a76..6d0ebd8afe 100644
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index 99778f80c0..be2ff3547c 100644
index 99778f80c0f6c2e15cc3b8298dc0bbc5493f3e83..be2ff3547c76584f42ff532f67526595f4a66209 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -177,6 +177,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -74,7 +74,7 @@ index 99778f80c0..be2ff3547c 100644
return this.c(predicate, blockposition, i, villageplace_occupancy).count();
}
diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java
index a5718af9b6..b6b4c8c491 100644
index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0611b72aa 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceType.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceType.java
@@ -44,7 +44,7 @@ public class VillagePlaceType {
@@ -95,7 +95,7 @@ index a5718af9b6..b6b4c8c491 100644
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c7a43dccee..03dc6ab4b2 100644
index 9469d6052ad920f9fd9848e7ee55e488372e5e62..e26fc1a6032027d16e72931c8329196b683774ba 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2559,6 +2559,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -107,7 +107,7 @@ index c7a43dccee..03dc6ab4b2 100644
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f01c74a2ea..b32f4d74a0 100644
index 0fa01267fa35f1afdc81c2636f9efa8506bcebb6..9c5de125a6ed207f238dff1e17e38a4083c4c251 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,6 +118,15 @@ public class PurpurWorldConfig {