Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-16 20:32:32 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Paper/Purpur/Empirecraft)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
f89be1281 [CI-SKIP] Fixup patch header
acbb69e67 Restore vanilla water animal limit
ea381dde3 Reset villager inventory on cancelled pickup event (again) (#5766) (Fixes #5765)

Purpur Changes:
6fe21994 Updated Upstream (Paper)

Empirecraft Changes:
0e568e7c Updated Paper
bbd2a014 Fire FurnaceExtractEvent more often for null players
This commit is contained in:
Simon Gardling 2021-06-02 10:59:12 -04:00
parent 8a33bae643
commit 36ee17da76
17 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

@ -1 +1 @@
Subproject commit b94a99b0337823efb2863243deeb8701c3ff781e
Subproject commit f89be1281a4a7461bb2bb372447406c0ecb04275

2
patches/Airplane/patches/server/0012-Dynamic-activation-range.patch
View File

@ -177,7 +177,7 @@ index 9a7bebd77302dbfd07ac802acbe2b9cb80eec26f..99cdcc9a9a7e6227a165c4ef779f8e76
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index c29f05b6fd0664345d8d09f898777a3e44f866c4..75c3239c9869863d9653916f3656c882b798cf07 100644
index 85374ac8f5460790de03b47d7c3ce19ed5596afe..ccb568a5e8501ac5e8901ef3a270cc87471d9ea1 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -231,11 +231,17 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/Purpur/patches/server/0017-Configurable-villager-brain-ticks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 75c3239c9869863d9653916f3656c882b798cf07..f08e7accaa012b1fc8a55176a69738722965319d 100644
index ccb568a5e8501ac5e8901ef3a270cc87471d9ea1..7a404996909454d1d6bc606609f0c19853cda91a 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -127,6 +127,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/Purpur/patches/server/0060-Villagers-follow-emerald-blocks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index f08e7accaa012b1fc8a55176a69738722965319d..3dab7416dfba200acd69d87886088777a998a194 100644
index 7a404996909454d1d6bc606609f0c19853cda91a..36d61ee7dd95d24d4220c1129b4a3edec7459375 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -59,6 +59,7 @@ import net.minecraft.world.entity.ai.BehaviorController;

2
patches/Purpur/patches/server/0061-Allow-leashing-villagers.patch
View File

@ -25,7 +25,7 @@ index 5327867d6beb97153b7b0744e99c2ad48e9c4bb4..091bc957ed810bc6f5c7e380af8e85b6
// Paper start - drop leash variable
PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman, !entityhuman.abilities.canInstantlyBuild);
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 3dab7416dfba200acd69d87886088777a998a194..ce7506cd71a66ef0b4b332cfb9d755f1a9d2af89 100644
index 36d61ee7dd95d24d4220c1129b4a3edec7459375..61e099680f8caf59e0a0d0d01fb0765cd033b494 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -149,6 +149,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

4
patches/Purpur/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index ce7506cd71a66ef0b4b332cfb9d755f1a9d2af89..bec501f1f9e8fcb4c2d6186b35912f9113a33f3a 100644
index 61e099680f8caf59e0a0d0d01fb0765cd033b494..31372fe2a7cfdc416594c943b7e771ba3aedf771 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -977,6 +977,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -981,6 +981,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityIronGolem d(WorldServer worldserver) {

2
patches/Purpur/patches/server/0089-Configurable-villager-breeding.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index bec501f1f9e8fcb4c2d6186b35912f9113a33f3a..fd25524e36317f69091150a85b5068fb6bcf189a 100644
index 31372fe2a7cfdc416594c943b7e771ba3aedf771..f2c4d2610ad10dc4fdaf7178e8cee56bfa06acfc 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -718,7 +718,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/Purpur/patches/server/0101-Ridables.patch
View File

@ -5399,7 +5399,7 @@ index 3d85501791fce621335f34bf508becb74b80210d..1370d2d8568a4ed62f2ec3d54abc7d2b
PiglinBruteAI.b(this);
PiglinBruteAI.c(this);
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index fd25524e36317f69091150a85b5068fb6bcf189a..a9a2caadca0f93438a4ad8e21d2e5ff5a98aa3fd 100644
index f2c4d2610ad10dc4fdaf7178e8cee56bfa06acfc..59215aaaa7237c39c9049aa5d106d83d1a65e392 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -32,6 +32,7 @@ import net.minecraft.network.syncher.DataWatcherObject;

2
patches/Purpur/patches/server/0142-Lobotomize-stuck-villagers.patch
View File

@ -30,7 +30,7 @@ index 48e6a4c588ef39a4bde067d79b96a656c68750ce..ac7bad10697c6fde7d512753992d5971
// Paper start - add target parameter
return this.a(blockposition, null, i);
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index a9a2caadca0f93438a4ad8e21d2e5ff5a98aa3fd..539a338081bd532779b7f6ec15cc91ab5bd1cca9 100644
index 59215aaaa7237c39c9049aa5d106d83d1a65e392..53cc18543c113efba90df126b3a5a9931954c4d7 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -89,6 +89,7 @@ import net.minecraft.world.level.IWorldReader;

4
patches/Purpur/patches/server/0143-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@ -186,7 +186,7 @@ index 25c10973c74f98224dd1d2ae5e7178b9781374aa..d50b5632f0e53147ea23109f1ed627b4
behaviorcontroller.removeMemory(MemoryModuleType.SECONDARY_JOB_SITE);
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 539a338081bd532779b7f6ec15cc91ab5bd1cca9..56f45267919c8c7722f1cde29a4ac18c7f5f1069 100644
index 53cc18543c113efba90df126b3a5a9931954c4d7..ff08528debe1ce89e36b5daa1c9b0ba07b6ecff3 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -203,7 +203,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@ -198,7 +198,7 @@ index 539a338081bd532779b7f6ec15cc91ab5bd1cca9..56f45267919c8c7722f1cde29a4ac18c
}
behaviorcontroller.a(Activity.CORE, Behaviors.a(villagerprofession, 0.5F));
@@ -951,6 +951,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -955,6 +955,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
}
public boolean canPlant() {

2
patches/Purpur/patches/server/0148-Configurable-entity-base-attributes.patch
View File

@ -1367,7 +1367,7 @@ index 1370d2d8568a4ed62f2ec3d54abc7d2bebc48f75..201b78ffb5062254a6b3447f217df03d
public static AttributeProvider.Builder eS() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 56f45267919c8c7722f1cde29a4ac18c7f5f1069..1b078f259ccfe480f688d9724bb0a2b4e672eec6 100644
index ff08528debe1ce89e36b5daa1c9b0ba07b6ecff3..152b35c35d7ec38800b638fcfe5c80ba61530c13 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -167,6 +167,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/Purpur/patches/server/0183-Add-config-for-villager-trading.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add config for villager trading
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 1b078f259ccfe480f688d9724bb0a2b4e672eec6..aefa40a09015e243664a531dbf31c6b1ff1d00e7 100644
index 152b35c35d7ec38800b638fcfe5c80ba61530c13..3db9da2c1691053c35333f7eb3691fea26398ecc 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -373,7 +373,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0015-Option-for-simpler-Villagers.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Option for simpler Villagers
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index aefa40a09015e243664a531dbf31c6b1ff1d00e7..b3f118e15fbc960cc50ee4ec67575e7dbaa01c57 100644
index 3db9da2c1691053c35333f7eb3691fea26398ecc..8663ff5bbfac6c84c4c1996ae96d6c49d545ad00 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -103,6 +103,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;

2
upstream/Empirecraft

@ -1 +1 @@
Subproject commit 105217a96305f2e400a871ddad5a383b4973706a
Subproject commit 0e568e7c3a42a130443bb08f641094e5613fce52

2
upstream/Purpur

@ -1 +1 @@
Subproject commit 5824eb8f2c2d243c19732c22943e71d707a50d21
Subproject commit 6fe21994e015fde4808dc9f844c86b1fef8cdb44

2
upstreamCommits/Empirecraft
View File

@ -1 +1 @@
105217a96305f2e400a871ddad5a383b4973706a
0e568e7c3a42a130443bb08f641094e5613fce52

2
upstreamCommits/Purpur
View File

@ -1 +1 @@
5824eb8f2c2d243c19732c22943e71d707a50d21
6fe21994e015fde4808dc9f844c86b1fef8cdb44