mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Rebuild patches
This commit is contained in:
BillyGalbreath
@@ -1,11 +1,11 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From 7a1cf21f169cf64860ee1ab0dd685876b7fee70f Mon Sep 17 00:00:00 2001
|
||||
From: jmp <jasonpenilla2@me.com>
|
||||
Date: Sun, 15 Nov 2020 02:18:15 -0800
|
||||
Subject: [PATCH] Make animal breeding times configurable
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
|
||||
index d9f9e2235..dd6725deb 100644
|
||||
index d9f9e2235d091e14e5d34bb9a3273e7f56e94295..dd6725debe0cf72dce13b6f2cac0556060e0eb41 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityAnimal.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityAnimal.java
|
||||
@@ -13,6 +13,7 @@ public abstract class EntityAnimal extends EntityAgeable {
|
||||
@@ -30,7 +30,7 @@ index d9f9e2235..dd6725deb 100644
|
||||
entityanimal.resetLove();
|
||||
entityageable.setBaby(true);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
|
||||
index d8354ec4d..ded4e10f5 100644
|
||||
index d8354ec4d19fc3fbddc2551ee217acb137482e63..ded4e10f5082fb5aa25368d9035affba287c3345 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityBee.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityBee.java
|
||||
@@ -100,6 +100,11 @@ public class EntityBee extends EntityAnimal implements IEntityAngerable, EntityB
|
||||
@@ -46,7 +46,7 @@ index d8354ec4d..ded4e10f5 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
|
||||
index 05929d5c5..a6ce4ca27 100644
|
||||
index 05929d5c539a738e6b6e8d32d9b0f843a665f4f6..a6ce4ca27c9670655a8f66bfc624f12659613379 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCat.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCat.java
|
||||
@@ -58,6 +58,11 @@ public class EntityCat extends EntityTameableAnimal {
|
||||
@@ -62,7 +62,7 @@ index 05929d5c5..a6ce4ca27 100644
|
||||
|
||||
public MinecraftKey eU() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
|
||||
index a16ecd7ed..26f783349 100644
|
||||
index a16ecd7edcd0ed081fff254d1f1429b32a4dcfb3..26f7833496ceaf5c6f67ac7fb276e1f82e51de07 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityChicken.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
|
||||
@@ -36,6 +36,11 @@ public class EntityChicken extends EntityAnimal {
|
||||
@@ -78,7 +78,7 @@ index a16ecd7ed..26f783349 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
index 1219b0aa9..63497ca02 100644
|
||||
index 1219b0aa9c62bc9a1bda45cc9e9a27f14a28fe2e..63497ca0266073dc0a16b7dc22641d08c3eaf400 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
@@ -21,6 +21,11 @@ public class EntityCow extends EntityAnimal {
|
||||
@@ -94,7 +94,7 @@ index 1219b0aa9..63497ca02 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
|
||||
index f5defe471..e87f5aeb9 100644
|
||||
index f5defe4713c6be7d32fb2116110516717460284e..e87f5aeb97fc35ff2b3464f31a2ec18432774cd4 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFox.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFox.java
|
||||
@@ -86,6 +86,11 @@ public class EntityFox extends EntityAnimal {
|
||||
@@ -110,7 +110,7 @@ index f5defe471..e87f5aeb9 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java
|
||||
index 548ff4449..a1578aade 100644
|
||||
index 548ff4449faca0abdf72487276fe49207bacfe17..a1578aade4a535144b5e40277c902f2e9ab9e940 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHoglin.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHoglin.java
|
||||
@@ -30,6 +30,11 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin {
|
||||
@@ -126,7 +126,7 @@ index 548ff4449..a1578aade 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
index 0415a4d1f..b19995f96 100644
|
||||
index 0415a4d1f328f117ee676156114acb3599aec202..b19995f962180a44ff388d58a26cc5782d0826e4 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
||||
@@ -17,6 +17,11 @@ public class EntityHorse extends EntityHorseAbstract {
|
||||
@@ -142,7 +142,7 @@ index 0415a4d1f..b19995f96 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
|
||||
index cb8aee569..f6421bb45 100644
|
||||
index cb8aee5691ff4ecaa6ae60f1637b1852d3b6c162..f6421bb45c5e6adf39fdc085efe2b2f500b76c0c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
|
||||
@@ -13,6 +13,11 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
|
||||
@@ -158,7 +158,7 @@ index cb8aee569..f6421bb45 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
|
||||
index 243aeb736..30cbc505d 100644
|
||||
index 243aeb736e350418e9476819bbfec0e7ab59f92f..30cbc505d2b0f4d3247edfd271de8daab023eb2a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseMule.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
|
||||
@@ -13,6 +13,11 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
|
||||
@@ -174,7 +174,7 @@ index 243aeb736..30cbc505d 100644
|
||||
@Override
|
||||
protected SoundEffect getSoundAmbient() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||
index e2c6a5807..408db52ca 100644
|
||||
index e2c6a5807a4554a7eebb148e40f1f8a1d979df5e..408db52cacbdfbca8af0a6a8e913b0128a3f5a76 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||
@@ -22,6 +22,11 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
|
||||
@@ -190,7 +190,7 @@ index e2c6a5807..408db52ca 100644
|
||||
|
||||
public static AttributeProvider.Builder eL() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
|
||||
index 559ba5097..2121a6c97 100644
|
||||
index 559ba50977147b8e2a0e7c1e7dc281faabd7f292..2121a6c979ba2ea7cb596ca6081750d2f8c7df9f 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
|
||||
@@ -18,6 +18,11 @@ public class EntityHorseZombie extends EntityHorseAbstract {
|
||||
@@ -206,7 +206,7 @@ index 559ba5097..2121a6c97 100644
|
||||
|
||||
public static AttributeProvider.Builder eL() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
|
||||
index 109927786..3bc6e6df9 100644
|
||||
index 1099277868f92fdaf4b0ec3a982f26f20ead7369..3bc6e6df9e0107debe5b15f5f7aad97ad336f304 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLlama.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
|
||||
@@ -57,6 +57,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
|
||||
@@ -222,7 +222,7 @@ index 109927786..3bc6e6df9 100644
|
||||
|
||||
public void setStrength(int i) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
index 7966b34f8..eb1f95d8b 100644
|
||||
index 7966b34f8d202d2260a35baa4cd594e4def89257..eb1f95d8bae4bc2580849614ba879dd1a8792ecb 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
@@ -30,6 +30,11 @@ public class EntityMushroomCow extends EntityCow implements IShearable {
|
||||
@@ -238,7 +238,7 @@ index 7966b34f8..eb1f95d8b 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
|
||||
index 2f8275cd6..a5be10dfb 100644
|
||||
index 2f8275cd6b3cde0d3f949219f67ba7f0e0031dc3..a5be10dfb0de08b0d97265278b1f11ad1e94b821 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
|
||||
@@ -26,6 +26,11 @@ public class EntityOcelot extends EntityAnimal {
|
||||
@@ -254,7 +254,7 @@ index 2f8275cd6..a5be10dfb 100644
|
||||
|
||||
private boolean isTrusting() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
|
||||
index eafae5516..c70180fdd 100644
|
||||
index eafae5516b9b5d51aa943796557926cf61476d2b..c70180fddb829419b9cc5188766e9130f9b8a94a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPanda.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
|
||||
@@ -65,6 +65,11 @@ public class EntityPanda extends EntityAnimal {
|
||||
@@ -270,7 +270,7 @@ index eafae5516..c70180fdd 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
|
||||
index e402d4a77..398e92bf7 100644
|
||||
index e402d4a77b57b8b12b7575a9793c30d7acfa7fb0..398e92bf7053c411bd98626efe4261e15256d3ee 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityParrot.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
|
||||
@@ -115,6 +115,11 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
|
||||
@@ -286,7 +286,7 @@ index e402d4a77..398e92bf7 100644
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
|
||||
index dade0bb29..7172e8cab 100644
|
||||
index dade0bb29422ebd68fae0edb74cbbf6d3ab89d64..7172e8cabf5b715ae9a1087b0d11e6cee81ea6e4 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPig.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPig.java
|
||||
@@ -29,6 +29,11 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
|
||||
@@ -302,7 +302,7 @@ index dade0bb29..7172e8cab 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
||||
index 3d649843f..40395dd7e 100644
|
||||
index 3d649843f565d2c8820b525c199bd2b9f9120cc7..40395dd7ea515e51a189d014a3274d15dc1d8ee6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
||||
@@ -67,6 +67,11 @@ public class EntityPolarBear extends EntityAnimal implements IEntityAngerable {
|
||||
@@ -318,7 +318,7 @@ index 3d649843f..40395dd7e 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
|
||||
index b766a27e9..654cd036a 100644
|
||||
index b766a27e98e19bffd3fe8f81f750750ae7681d02..654cd036a8e4aa4499f10f528b684e003c469c9a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
|
||||
@@ -30,6 +30,11 @@ public class EntityRabbit extends EntityAnimal {
|
||||
@@ -334,7 +334,7 @@ index b766a27e9..654cd036a 100644
|
||||
|
||||
// CraftBukkit start - code from constructor
|
||||
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
|
||||
index a151d4295..32130c068 100644
|
||||
index a151d4295c02930687a23212647de60cce5405ca..32130c0681501e3e5a47b199f0bb39daac416ed3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntitySheep.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
|
||||
@@ -66,6 +66,11 @@ public class EntitySheep extends EntityAnimal implements IShearable {
|
||||
@@ -350,7 +350,7 @@ index a151d4295..32130c068 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityStrider.java b/src/main/java/net/minecraft/server/EntityStrider.java
|
||||
index 172867f50..9ab1b5af6 100644
|
||||
index 172867f50d0dba45a296b029c8fa85f1a19a49dc..9ab1b5af68774fa4d4da89195fdb91172370d43d 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityStrider.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityStrider.java
|
||||
@@ -38,6 +38,11 @@ public class EntityStrider extends EntityAnimal implements ISteerable, ISaddleab
|
||||
@@ -366,7 +366,7 @@ index 172867f50..9ab1b5af6 100644
|
||||
|
||||
public static boolean c(EntityTypes<EntityStrider> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||
index 2b34e6cf3..067f7f28b 100644
|
||||
index 2b34e6cf3b86319bd2875d92b63902889fec32a8..067f7f28b02b388d56b93b1ed8274799757196e6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||
@@ -37,6 +37,11 @@ public class EntityTurtle extends EntityAnimal {
|
||||
@@ -382,7 +382,7 @@ index 2b34e6cf3..067f7f28b 100644
|
||||
|
||||
public void setHomePos(BlockPosition blockposition) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
|
||||
index 9ae716859..6c25f667e 100644
|
||||
index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71c6a26958 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityWolf.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
|
||||
@@ -48,6 +48,11 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
|
||||
@@ -398,7 +398,7 @@ index 9ae716859..6c25f667e 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index a108545c7..992a0babb 100644
|
||||
index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe2f56f00c 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -423,10 +423,12 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user