mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 5b123cd1 [CI-SKIP] [Auto] Rebuild Patches becb478c Add ignore discounts API 9e90c15f Add custom ranges to beacons 068313fa Item no age & no player pickup 1b3c20f9 Fix client lag on advancement loading (#4710) c596edb1 [CI-SKIP] Update IRC information in readme and config (#4751) a936a413 [Auto] Updated Upstream (Bukkit)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
index 3468e096b5..d1a260a3b2 100644
|
||||
index 33b7bc39f..7cf6d4a4c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
@@ -640,7 +640,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
|
||||
@Override
|
||||
public boolean canBreed() {
|
||||
@@ -18,7 +18,7 @@ index 3468e096b5..d1a260a3b2 100644
|
||||
|
||||
private boolean fr() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 3b8058890b..ce7b2b7ab9 100644
|
||||
index 3b8058890..ce7b2b7ab 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -458,6 +458,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user