Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
05af2837c [CI-SKIP] Improved the annotation test output
586966949 abstract custom set tags, add entity tags
c7667378e Added PlayerLoomPatternSelectEvent
00972e80d Reimplement GS4QueryEvent
544c5c278 Re-add coral block tags (#4987)
7d56c8deb Added PlayerLecternPageChangeEvent
c7cdf255b Add BlockFailedDispenseEvent
c8a8d6fbe Added world settings for mobs picking up loot
91eda5bd3 Added ServerResourcesReloadedEvent
be81b4f5c Add a Enchantable MaterialTag
975d18703 Add doors to material tags
d075e748e colorful itemdump
f3ba3dee0 Added WorldGameRuleChangeEvent
086d20118 Guardian beam workaround
b63c890ec Support spawning item stacks
d7d74c552 added height config for bamboo
7878e3bc2 Use setAmount for Recipe Amount
50e70697b Add EntityLoadCrossbowEvent
f344e092c Add Anti-Xray bypass permission
9fd31e675 fix for nerfed slime mobs splitting
4a7962cd1 Zombie API - breaking doors
5650a41f5 Fix interact event not being called in adventure
2c9ed4335 Add PlayerFlowerPotManipulateEvent
1f32290b6 [Auto] Updated Upstream (CraftBukkit)
d87694a20 Redact Velocity forwarding secret properly (#4980)
24a0b0206 [Auto] Updated Upstream (CraftBukkit)
7681042ef [Auto] Updated Upstream (Bukkit/CraftBukkit)
7dea3dba6 [Auto] Updated Upstream (CraftBukkit)
4b3792920 JavaDoc fixes
f13b4727e Allow disabling mob spawner spawn egg transformation
525b50737 Cache burn durations
2c37d1077 Optimized tick ready check
b4000b01a Add API to get the Material of Boats and Minecarts
f1317386d Fix sign lazy initialisation
9f61759d9 Updated Upstream (CraftBukkit/Spigot) (#4972)
aaff430b6 [CI-SKIP] Use GitHub Actions for build status
9f4055d99 Fix harming potion dupe
7bfb781ff Additional Block Material API's
0eaffd008 Micro Optimize DataBits

Tuinity Changes:
9e5cabb6e Port starlight changes
This commit is contained in:
jmp
2021-01-01 15:36:31 -08:00
parent da957253a3
commit c7b279fe1b
112 changed files with 974 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 8ccb7fd679...05af2837cd

2
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -8,7 +8,7 @@ Tuinity config
API to retrieve raw YamlConfiguration + timing exports
diff --git a/pom.xml b/pom.xml
index 1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57..4516ba097e8afc3e422efc368311fa66e967c05a 100644
index 35599164b24185bc51813ae58090f6f4bffdba4a..024be926afb1219c6443c496721f4bd0a4fec222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@

4
patches/api/0007-AFK-API.patch
View File

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f7fd13dc6056817819c1dbffcaf19c25b95fe2c0..250b434af848546fa3a6ffd748f03a910095b33d 100644
index ea5257cc94d084fe4e0b9d9685e51d8f70cb84cb..183333a7468100271676b74709dcbb26d2b2b363 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1933,4 +1933,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1927,4 +1927,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0018-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 250b434af848546fa3a6ffd748f03a910095b33d..e398da35bef48b5846d8c66df75b1df11b43e382 100644
index 183333a7468100271676b74709dcbb26d2b2b363..e0ceb4d285ef977398a083bc4f4295ebd0c91277 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1953,5 +1953,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1947,5 +1947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0020-ItemStack-convenience-methods.patch
View File

@@ -46,7 +46,7 @@ index 4ba991b79f13219182df35b4ce0c5cf57cbd208b..a2e476f154344f9473dd9b4886650544
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index ccd81fca25233c2a9c2a8c3f4dda3053d7b2e723..3fecde7a0d2dd45ca090dbcc49e6d85169bda443 100644
index 4f2520f7a4ca6d57a85924ada1068a055b9a01fb..23cef1e67236a879525f39da994efc9a9c5cd289 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -68,7 +68,7 @@ index ccd81fca25233c2a9c2a8c3f4dda3053d7b2e723..3fecde7a0d2dd45ca090dbcc49e6d851
/**
* Represents a stack of items.
@@ -791,4 +803,627 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -792,4 +804,627 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return itemMeta.hasItemFlag(flag);
}
// Paper end

162
patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -33,20 +33,17 @@ index 9dad814cf51bc59ec5dfbf14474fea6557de38aa..7baf7ee3b62135eda8f0d9c1d761b79f
public Class<T> getType() {
return type;
diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
index c91ea2a0679a7f3a5627b5a008e0b39df3332889..dbca3a2196cf2d7722226224e7f85237267e9d4d 100644
index a02a02aa0c87e0f0ed9e509e4dcab01565b3d92a..6c99f4b4960f8f982557bb42717a2868d57ce4b7 100644
--- a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
+++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
@@ -22,6 +22,9 @@ import java.util.stream.Stream;
@@ -21,10 +21,14 @@ import java.util.stream.Stream;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+/**
+ * Material set tag
+ */
public class MaterialSetTag implements Tag<Material> {
private final NamespacedKey key;
@@ -29,6 +32,7 @@ public class MaterialSetTag implements Tag<Material> {
public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
/**
* @deprecated Use NamespacedKey version of constructor
@@ -54,7 +51,7 @@ index c91ea2a0679a7f3a5627b5a008e0b39df3332889..dbca3a2196cf2d7722226224e7f85237
*/
@Deprecated
public MaterialSetTag(@NotNull Predicate<Material> filter) {
@@ -37,6 +41,7 @@ public class MaterialSetTag implements Tag<Material> {
@@ -33,6 +37,7 @@ public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
/**
* @deprecated Use NamespacedKey version of constructor
@@ -62,7 +59,7 @@ index c91ea2a0679a7f3a5627b5a008e0b39df3332889..dbca3a2196cf2d7722226224e7f85237
*/
@Deprecated
public MaterialSetTag(@NotNull Collection<Material> materials) {
@@ -45,6 +50,7 @@ public class MaterialSetTag implements Tag<Material> {
@@ -41,6 +46,7 @@ public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
/**
* @deprecated Use NamespacedKey version of constructor
@@ -541,74 +538,6 @@ index 931ffa38faab86445a5d63364a47cb653ca3d4ed..97b9ade0e771eae663fb42f91e155450
*/
public int nextEntityId();
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e6d2abf284c103a8bcddd8b4f9cb34d86a4f2fa6..4df6482da0cc498cad50eabdac183bea3634c74b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3131,7 +3131,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
@@ -3148,7 +3147,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
@@ -3199,7 +3197,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -3220,7 +3217,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -3277,7 +3273,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -3300,7 +3295,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public default <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }// Paper start - Expand Particle API
/**
@@ -3374,7 +3368,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
- * @param <T> Particle data type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
@@ -3400,7 +3393,6 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
- * @param <T> Particle data type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
index afb7b136b461202026290624836446cff9f9e45d..087579fdff09237409c9f80446e7a15a78f9040c 100644
--- a/src/main/java/org/bukkit/WorldBorder.java
@@ -670,7 +599,7 @@ index d1757f3d456ff9efce26ce8baa1d16d896908cc2..a5db52386e11e4b5511ae417a0e7ac92
TASK(ChatColor.GREEN),
CHALLENGE(ChatColor.DARK_PURPLE),
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 6933fd6ad353a2d008c4a64c52a64bf36bd8035c..2966d876af3a77966fab927f8714ebf06bf6c926 100644
index 0c72d00ad238ab69d7ae0941e3ecb6c86e71624d..73cf7437795ef185860bfefe51d9481fa297a939 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -183,6 +183,9 @@ public interface Block extends Metadatable {
@@ -805,18 +734,6 @@ index 2e17b2d4f759531fbe9ee8e9b00c839186af09ca..9382234722792b5920a2456187e07958
public interface AnimalTamer {
/**
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
index bca9d3659f6fceeca4b7fecbc7034d6fdbc4581e..c2096b5344d48d855d031538ec32e0154bd9054d 100644
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
@@ -142,7 +142,6 @@ public interface AreaEffectCloud extends Entity {
* @param particle the new particle type
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> the particle data type // Paper
*/
<T> void setParticle(@NotNull Particle particle, @Nullable T data);
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index 8ca6c9eba926f436203af211c6e274a59ddb15e8..f61419d3ce15bd553a864e4e9cd988b57d8f9695 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -1015,58 +932,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e398da35bef48b5846d8c66df75b1df11b43e382..8da3ce6d1ba6911cb1a4be2e425266bd4760c052 100644
index e0ceb4d285ef977398a083bc4f4295ebd0c91277..8da3ce6d1ba6911cb1a4be2e425266bd4760c052 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1433,7 +1433,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
@@ -1450,7 +1449,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
@@ -1501,7 +1499,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -1522,7 +1519,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -1579,7 +1575,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -1602,7 +1597,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
- * @param <T> Type
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -1782,6 +1776,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1776,6 +1776,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -1075,7 +944,7 @@ index e398da35bef48b5846d8c66df75b1df11b43e382..8da3ce6d1ba6911cb1a4be2e425266bd
* @return the client option value of the player
*/
@NotNull
@@ -1802,6 +1798,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1796,6 +1798,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start
@@ -1495,19 +1364,6 @@ index 23d55f756b2bb5a557bfae102d7039d8394fbe69..50e58cf9a494c2cf17b7f55918e3d21f
* @return the {@link net.md_5.bungee.api.chat.hover.content.Content} of that ItemStack
*/
@NotNull
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 3fecde7a0d2dd45ca090dbcc49e6d85169bda443..595cf92aeab37e06e5409d2a34387e56340b49e3 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -631,6 +631,8 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
*
* This expects that the DataVersion was stored on the root of the Compound, as saved from
* the {@link #serializeAsBytes()} API returned.
+ *
+ * @param bytes Bytes to deserialize
* @return ItemStack migrated to this version of Minecraft if needed.
*/
@NotNull
diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java
index 7944f26a3e2a92601c3be0e55c00c39cc16cf177..8e7bb66c96d34b73959c0653b2a8e7b422da35fe 100644
--- a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java

1286
patches/server/0001-Tuinity-Server-Changes.patch
View File

File diff suppressed because it is too large Load Diff

6
patches/server/0002-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/pom.xml b/pom.xml
index 78c2a8bbcc0132f891c8aa545529d20aa0d9eb57..422bed88a0860f768e162a38a1c16265451f5990 100644
index 174c0b67c1c5b41d80613128ebf2d78ee27f3cee..aafe4d0962d641866bb0f82728719c102c56fcc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,10 @@
@@ -48,10 +48,10 @@ index 229c3b0f0c650b501f31147adaa17194af57fedd..f88cf526d272fe47b5a474c0b344b748
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2bb4710868b4756c3446bb785c7dc1f00c9e4258..a8a90679687d680bb26b4fa7c1044f614585c867 100644
index 34fa53eb1370682fff3dc342e33ffe7c48d1689f..1f2bcafbe5444fe0900dea6a493bac2ccc6b8b50 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1507,7 +1507,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

4
patches/server/0003-Purpur-config-files.patch
View File

@@ -29,7 +29,7 @@ index 52c0ab1ce46e1f3233ef746d9bc699356fa9fae4..4d8740678049aa749b42618470e9cc83
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index bc156a5edefe117ad45638d434fe4946fb50159d..041016de85360adacf4a5d0845bb1ebcc25a14b9 100644
index 673c40d952bae6ae9e92aac9742e58ffb6a8b1bb..ce14283dd1a1fddbea17c2fbaf1c4ef9d7a7479f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -78,7 +78,7 @@ index 9b35c8ad9efe9241fe442bc6ef2e9f62def386d8..2c4c13b30b4533f5476f1128317d477a
if (this.bF) {
this.bF = false;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 59abca0fd2330e1cdeda603d4146e4bb1afc3090..ca4d260e8faf852b0986c4cd8645e5135afe6156 100644
index 4a17c1b8092968247ee9fa0ce2b5bd44baf2b18f..68dec17bbf64a60c774ab26abc326b953889aa8c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

4
patches/server/0009-AFK-API.patch
View File

@@ -25,7 +25,7 @@ index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c548410
super(EntityTypes.PLAYER, world);
this.bL = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 72fcd7f259630cb3c194deb685a2c4498a7c7079..76d42805a4616da11c06b492590a9d52e979a4b7 100644
index 40f56858143651bb0addd0b74db7388ecbe56521..82b975dd483b55461df0e110add5546a7815c650 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1904,8 +1904,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 37e9b8983fc310a04c98e27048b119439179cb5f..d42dbc3b44f8b54b05f356155727f5a8f6a3e98e 100644
index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d218e26635b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0011-Configurable-server-mod-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a8a90679687d680bb26b4fa7c1044f614585c867..5e0f06a254d62acd491ba56371f3391423eb64fd 100644
index 1f2bcafbe5444fe0900dea6a493bac2ccc6b8b50..0945e9cf8a37868beb9ea13e7b889aae827b4662 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1507,7 +1507,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

6
patches/server/0013-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5e0f06a254d62acd491ba56371f3391423eb64fd..5d8cf545acf231f8f9c037db26f4d29bc01efabb 100644
index 0945e9cf8a37868beb9ea13e7b889aae827b4662..3ac30bbf7ad327372b02ed365572fd3226fb6f9a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -163,6 +163,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
public static final int TICK_TIME = 1000000000 / TPS;
private static final int SAMPLE_INTERVAL = 20; // Paper
public final double[] recentTps = new double[ 3 ];
@@ -16,7 +16,7 @@ index 5e0f06a254d62acd491ba56371f3391423eb64fd..5d8cf545acf231f8f9c037db26f4d29b
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -985,6 +986,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -980,6 +981,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
// Paper end

2
patches/server/0014-ItemFactory-getMonsterEgg.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index 76c585299096ab3719bf23b32f1ce046202a9818..f543bd84ffa3714eb0c4a6308f52470943afb452 100644
index a236e0441fc20270b4c44ed5a7d5b94297949226..eeac4aeaf21b43647aa643ec55a1ae842a7ac197 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -9,7 +9,7 @@ import javax.annotation.Nullable;

2
patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -51,7 +51,7 @@ index bf914dc5ee7f2d4a324b6711ea273f5581ec84ad..1138981aebb7fbb3f3839dcd221e3ee8
if (this.bp == null) {
this.bp = new ChatMessage(this.f());
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index f543bd84ffa3714eb0c4a6308f52470943afb452..b5995f6fe3f44c97780cc08d427c61f7890c4bd5 100644
index eeac4aeaf21b43647aa643ec55a1ae842a7ac197..d66acf90d0b1bcd5c6481d2a2ee753c7693995b0 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -7,6 +7,13 @@ import java.util.Objects;

4
patches/server/0017-EntityMoveEvent.patch
View File

@@ -30,10 +30,10 @@ index 94585029142f8d8c494cf957d5363a0aec0b697d..144c443f6f8b7ab2c6df2d32c27ef8be
this.damageEntity(DamageSource.DROWN, 1.0F);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5d8cf545acf231f8f9c037db26f4d29bc01efabb..fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e 100644
index 3ac30bbf7ad327372b02ed365572fd3226fb6f9a..de72f058b6de539ff75858120d6d023eaae22275 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1399,6 +1399,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1394,6 +1394,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
while (iterator.hasNext()) {
WorldServer worldserver = (WorldServer) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper

4
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 76d42805a4616da11c06b492590a9d52e979a4b7..77603a4819c02d73d4b058a8a3d822ae6a4cb505 100644
index 82b975dd483b55461df0e110add5546a7815c650..6f8bc857141b7e9a3444b81cddd13228f8cbb9a5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,7 +67,7 @@ index 76d42805a4616da11c06b492590a9d52e979a4b7..77603a4819c02d73d4b058a8a3d822ae
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d42dbc3b44f8b54b05f356155727f5a8f6a3e98e..cd562571ac6738fad39f585c1c046ee8e8c90f78 100644
index d1d4f4baf33e6b2224116f22a63b6d218e26635b..07fcf1646a46b867ffb0e88746b4a781ef55729b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1666,6 +1666,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0021-Alternative-Keepalive-Handling.patch
View File

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cd562571ac6738fad39f585c1c046ee8e8c90f78..a8908a46260e90c6366eb100688f15d831be1b4f 100644
index 07fcf1646a46b867ffb0e88746b4a781ef55729b..d74986818af4fbefdd60f865d2225d61008df7d1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0048-Signs-allow-color-codes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 77603a4819c02d73d4b058a8a3d822ae6a4cb505..da693a31f26973467b4494e79996c3f0d8a3a758 100644
index 6f8bc857141b7e9a3444b81cddd13228f8cbb9a5..26c508258f1638fcf7d11ba87816cdf4771e9fc6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1429,6 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 77603a4819c02d73d4b058a8a3d822ae6a4cb505..da693a31f26973467b4494e79996c3f0
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a8908a46260e90c6366eb100688f15d831be1b4f..9679c53c9252502dab3e69eaf5c2be0c22943959 100644
index d74986818af4fbefdd60f865d2225d61008df7d1..1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2837,6 +2837,14 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0050-Controllable-Minecarts.patch
View File

@@ -106,7 +106,7 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e
this.move(EnumMoveType.SELF, this.getMot());
if (!this.onGround) {
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index da693a31f26973467b4494e79996c3f0d8a3a758..5bee05e6e8b52d1edea81a0d76ec9cfdb5acf704 100644
index 26c508258f1638fcf7d11ba87816cdf4771e9fc6..452675eb071513609665ec214ddb0b01874c3a09 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1004,6 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0052-Players-should-not-cram-to-death.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 5bee05e6e8b52d1edea81a0d76ec9cfdb5acf704..36be65f9a36ea1b35ffa882eec295e1f46021f0c 100644
index 452675eb071513609665ec214ddb0b01874c3a09..a86e29ff086a4fe8aa4e8395ba420c0aff8f0be0 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1406,7 +1406,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
patches/server/0059-Configurable-TPS-Catchup.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e..2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72 100644
index de72f058b6de539ff75858120d6d023eaae22275..1c97728959709930d280d0522ef6331fb5cb3429 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1003,7 +1003,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -998,7 +998,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait");
this.X = true;

14
patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch
View File

@@ -9,12 +9,12 @@ that 5 arrows, 5 snowballs, 5 tridents, etc. will be allowed to be
saved/loaded per chunk. The default value of -1 disables the limit.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index ae5ed3bd0b663092a4658b24cbd69d37b4e141cb..2452f54d96cab2d93140c64e25d9b799cbc94caa 100644
index 80409c4b52a4bb7146760070dae0e04d49bdd6b3..0bca517b4948cd55bfbf3ba4d5c1b3cd895cc086 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -709,4 +709,9 @@ public class PaperWorldConfig {
private void fixCuringExploit() {
fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
@@ -731,4 +731,9 @@ public class PaperWorldConfig {
private void disableMobSpawnerSpawnEggTransformation() {
disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
}
+
+ public int projectileSaveLimit = -1;
@@ -23,10 +23,10 @@ index ae5ed3bd0b663092a4658b24cbd69d37b4e141cb..2452f54d96cab2d93140c64e25d9b799
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 1f1f1a0cb84a07087025fd831441d0571d6de7c6..423da11d4910bbe12625ec5a16edfd6e80cd3dea 100644
index 13553da7c37d2701854c8d824311dd7bc1a0a423..66058a6365fe4da8980b09904142ed44e42c5aac 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -518,11 +518,21 @@ public class ChunkRegionLoader {
@@ -529,11 +529,21 @@ public class ChunkRegionLoader {
chunk.d(false);
@@ -48,7 +48,7 @@ index 1f1f1a0cb84a07087025fd831441d0571d6de7c6..423da11d4910bbe12625ec5a16edfd6e
NBTTagCompound nbttagcompound4 = new NBTTagCompound();
// Paper start
if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
@@ -653,10 +663,20 @@ public class ChunkRegionLoader {
@@ -664,10 +674,20 @@ public class ChunkRegionLoader {
NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
World world = chunk.getWorld();

4
patches/server/0071-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 423da11d4910bbe12625ec5a16edfd6e80cd3dea..77f31dc1e45b438ece691617deb17d7a5fbbc94b 100644
index 66058a6365fe4da8980b09904142ed44e42c5aac..cda8847829a3a92869f0f12d74f54daa97c5e2a1 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -525,6 +525,7 @@ public class ChunkRegionLoader {
@@ -536,6 +536,7 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();

4
patches/server/0074-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option for boats to eject players on land
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index fdfdf83c28c3065fa89fba9e44b3da99f9791e0e..d53bbe31694c2d88939332691cdf145c46099e22 100644
index da84cf98022b771bdf0c9d0b284aa7d4d59318e0..4f95976f9a852fa89cedd1fe81d2077fe5d118ee 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -440,6 +440,7 @@ public class EntityBoat extends Entity {
@@ -441,6 +441,7 @@ public class EntityBoat extends Entity {
if (f > 0.0F) {
this.aw = f;

8
patches/server/0078-Add-5-second-tps-average-in-tps.patch → patches/server/0077-Add-5-second-tps-average-in-tps.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add 5 second tps average in /tps
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72..dd1e083289b875f1b87ae2aa6179c7babaf79ad5 100644
index 1c97728959709930d280d0522ef6331fb5cb3429..11e76719df539d39b1ecd8303a8d54319b00f182 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -167,7 +167,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -162,7 +162,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
public static final int TPS = 20;
public static final int TICK_TIME = 1000000000 / TPS;
private static final int SAMPLE_INTERVAL = 20; // Paper
@@ -17,7 +17,7 @@ index 2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72..dd1e083289b875f1b87ae2aa6179c7ba
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -886,6 +886,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -881,6 +881,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -25,7 +25,7 @@ index 2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72..dd1e083289b875f1b87ae2aa6179c7ba
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -978,13 +979,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -973,13 +974,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

82
patches/server/0077-Implement-bamboo-growth-settings.patch
View File

@@ -1,82 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 20:57:29 -0500
Subject: [PATCH] Implement bamboo growth settings
diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
index f208ab50985d71996c65fcf31615052b967acc93..ce56edb7c8543f3f685301ebf62d9836ccf4197c 100644
--- a/src/main/java/net/minecraft/server/BlockBamboo.java
+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
@@ -99,7 +99,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
if (random.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.bambooModifier) * 3)) == 0 && worldserver.isEmpty(blockposition.up()) && worldserver.getLightLevel(blockposition.up(), 0) >= 9) { // Spigot
int i = this.b(worldserver, blockposition) + 1;
- if (i < 16) {
+ if (i < worldserver.purpurConfig.bambooMaxHeight) { // Purpur
this.a(iblockdata, (World) worldserver, blockposition, random, i);
}
}
@@ -130,7 +130,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
int i = this.a(iblockaccess, blockposition);
int j = this.b(iblockaccess, blockposition);
- return i + j + 1 < 16 && (Integer) iblockaccess.getType(blockposition.up(i)).get(BlockBamboo.f) != 1;
+ return i + j + 1 < ((World) iblockaccess).purpurConfig.bambooMaxHeight && iblockaccess.getType(blockposition.up(i)).get(BlockBamboo.f) != 1; // Purpur
}
@Override
@@ -149,7 +149,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
BlockPosition blockposition1 = blockposition.up(i);
IBlockData iblockdata1 = worldserver.getType(blockposition1);
- if (k >= 16 || (Integer) iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) {
+ if (k >= worldserver.purpurConfig.bambooMaxHeight || iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) { // Purpur
return;
}
@@ -190,7 +190,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
}
int j = (Integer) iblockdata.get(BlockBamboo.d) != 1 && !iblockdata2.a(Blocks.BAMBOO) ? 0 : 1;
- int k = (i < 11 || random.nextFloat() >= 0.25F) && i != 15 ? 0 : 1;
+ int k = (i < world.purpurConfig.bambooSmallHeight || random.nextFloat() >= 0.25F) && i != (world.purpurConfig.bambooMaxHeight - 1) ? 0 : 1; // Purpur
// CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, blockposition, blockposition.up(), (IBlockData) ((IBlockData) ((IBlockData) this.getBlockData().set(BlockBamboo.d, j)).set(BlockBamboo.e, blockpropertybamboosize)).set(BlockBamboo.f, k), 3)) {
@@ -205,7 +205,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
protected int a(IBlockAccess iblockaccess, BlockPosition blockposition) {
int i;
- for (i = 0; i < 16 && iblockaccess.getType(blockposition.up(i + 1)).a(Blocks.BAMBOO); ++i) {
+ for (i = 0; i < ((World) iblockaccess).purpurConfig.bambooMaxHeight && iblockaccess.getType(blockposition.up(i + 1)).a(Blocks.BAMBOO); ++i) { // Purpur
;
}
@@ -215,7 +215,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
protected int b(IBlockAccess iblockaccess, BlockPosition blockposition) {
int i;
- for (i = 0; i < 16 && iblockaccess.getType(blockposition.down(i + 1)).a(Blocks.BAMBOO); ++i) {
+ for (i = 0; i < ((World) iblockaccess).purpurConfig.bambooMaxHeight && iblockaccess.getType(blockposition.down(i + 1)).a(Blocks.BAMBOO); ++i) { // Purpur
;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d61a96f0d9fc92780da0c698ffb4b903878a4198..b4358f89f9673170819c8995cd982952a3b915f3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -166,6 +166,13 @@ public class PurpurWorldConfig {
});
}
+ public int bambooMaxHeight = 16;
+ public int bambooSmallHeight = 10;
+ private void bambooSettings() {
+ bambooMaxHeight = getInt("blocks.bamboo.max-height", bambooMaxHeight);
+ bambooSmallHeight = getInt("blocks.bamboo.small-height", bambooSmallHeight);
+ }
+
public boolean dispenserApplyCursedArmor = true;
private void dispenserSettings() {
dispenserApplyCursedArmor = getBoolean("blocks.dispenser.apply-cursed-to-armor-slots", dispenserApplyCursedArmor);

2
patches/server/0079-Implement-elytra-settings.patch → patches/server/0078-Implement-elytra-settings.patch
View File

@@ -93,7 +93,7 @@ index 3663b701736b583db80e3119b642e47b8a0e6ff3..18f767dc574e7345d2db73e6be44f4e6
entityhuman.r(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b4358f89f9673170819c8995cd982952a3b915f3..db6607acc7540bbadfdf7684ac8f10baedd3ccf7 100644
index d61a96f0d9fc92780da0c698ffb4b903878a4198..886c3b98d6bff04a93cd963a092654ef1c9729d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -129,6 +129,19 @@ public class PurpurWorldConfig {

2
patches/server/0080-Item-entity-immunities.patch → patches/server/0079-Item-entity-immunities.patch
View File

@@ -88,7 +88,7 @@ index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f
int i;
int j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index db6607acc7540bbadfdf7684ac8f10baedd3ccf7..66425f79a51587e21f83e11acb74f79a042c7850 100644
index 886c3b98d6bff04a93cd963a092654ef1c9729d1..793c43299e71526cca01dba3badf06dca52333c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,21 @@ public class PurpurWorldConfig {

0
patches/server/0081-Add-ping-command.patch → patches/server/0080-Add-ping-command.patch
View File

16
patches/server/0082-Configurable-jockey-options.patch → patches/server/0081-Configurable-jockey-options.patch
View File

@@ -61,7 +61,7 @@ index 65bae8c9f28c23b0b5dd5d048e7fc7daf328075c..32b75f710b12efbcecec2c8d72d4d8cb
public void setAngerTarget(@Nullable UUID uuid) {
this.br = uuid;
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index e3606722cb1b3f6a11d34e1cdef7210280dba677..b90ea31440fe49124bd2fb003884768ce8a1e528 100644
index 62d202ff871cf3f3deea69931fbee84131bdda8b..a43f44bcf97b30d1cea2fb5d93e6949e41ab86fd 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -93,7 +93,7 @@ index e3606722cb1b3f6a11d34e1cdef7210280dba677..b90ea31440fe49124bd2fb003884768c
@Override
protected void initPathfinder() {
if (world.paperConfig.zombiesTargetTurtleEggs) this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3)); // Paper
@@ -439,19 +454,19 @@ public class EntityZombie extends EntityMonster {
@@ -441,19 +456,19 @@ public class EntityZombie extends EntityMonster {
if (object instanceof EntityZombie.GroupDataZombie) {
EntityZombie.GroupDataZombie entityzombie_groupdatazombie = (EntityZombie.GroupDataZombie) object;
@@ -119,7 +119,7 @@ index e3606722cb1b3f6a11d34e1cdef7210280dba677..b90ea31440fe49124bd2fb003884768c
EntityChicken entitychicken1 = (EntityChicken) EntityTypes.CHICKEN.a(this.world);
entitychicken1.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F);
@@ -459,6 +474,7 @@ public class EntityZombie extends EntityMonster {
@@ -461,6 +476,7 @@ public class EntityZombie extends EntityMonster {
entitychicken1.setChickenJockey(true);
this.startRiding(entitychicken1);
worldaccess.addEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
@@ -127,7 +127,7 @@ index e3606722cb1b3f6a11d34e1cdef7210280dba677..b90ea31440fe49124bd2fb003884768c
}
}
}
@@ -561,7 +577,7 @@ public class EntityZombie extends EntityMonster {
@@ -563,7 +579,7 @@ public class EntityZombie extends EntityMonster {
public static class GroupDataZombie implements GroupDataEntity {
@@ -193,10 +193,10 @@ index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 66425f79a51587e21f83e11acb74f79a042c7850..14e05b7a7cc5e89f08d166399c0f2bd2259e09a9 100644
index 793c43299e71526cca01dba3badf06dca52333c6..b3deaaea159546509fc7cff2d843455461520dfa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -264,6 +264,15 @@ public class PurpurWorldConfig {
@@ -257,6 +257,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -212,7 +212,7 @@ index 66425f79a51587e21f83e11acb74f79a042c7850..14e05b7a7cc5e89f08d166399c0f2bd2
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
@@ -303,6 +312,15 @@ public class PurpurWorldConfig {
@@ -296,6 +305,15 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}
@@ -228,7 +228,7 @@ index 66425f79a51587e21f83e11acb74f79a042c7850..14e05b7a7cc5e89f08d166399c0f2bd2
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
@@ -378,8 +396,35 @@ public class PurpurWorldConfig {
@@ -371,8 +389,35 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

4
patches/server/0083-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0082-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -321,10 +321,10 @@ index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0c
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 14e05b7a7cc5e89f08d166399c0f2bd2259e09a9..dbeea1ecec72c84ba9648ea8c373d3e66dd220d6 100644
index b3deaaea159546509fc7cff2d843455461520dfa..74aee0687cb8aa7e4b7efbf34d6374a516d873c0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -340,6 +340,15 @@ public class PurpurWorldConfig {
@@ -333,6 +333,15 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

8
patches/server/0084-Add-phantom-spawning-options.patch → patches/server/0083-Add-phantom-spawning-options.patch
View File

@@ -233,10 +233,10 @@ index 661ad8f8e67046211e001ea40d97660d7c88f8e5..ee91c33a7a2edca02caf5c71fd6429f9
return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ca4d260e8faf852b0986c4cd8645e5135afe6156..a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9 100644
index 68dec17bbf64a60c774ab26abc326b953889aa8c..f91d9a19b3d9870c99a03c86eb835b8ec68cc133 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1566,6 +1566,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return new DifficultyDamageScaler(this.getDifficulty(), this.getDayTime(), i, f);
}
@@ -245,10 +245,10 @@ index ca4d260e8faf852b0986c4cd8645e5135afe6156..a8571dae8daefb557a8e3ee39c80ebc3
public int c() {
return this.d;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dbeea1ecec72c84ba9648ea8c373d3e66dd220d6..813ce4cecbcf360d8c966cd183771a7cc3cd8571 100644
index 74aee0687cb8aa7e4b7efbf34d6374a516d873c0..f60bc17cf25211bf0c9007307c54821aecc7bb96 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -343,10 +343,34 @@ public class PurpurWorldConfig {
@@ -336,10 +336,34 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;

6
patches/server/0085-Implement-bed-explosion-options.patch → patches/server/0084-Implement-bed-explosion-options.patch
View File

@@ -18,7 +18,7 @@ index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e5950422
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 813ce4cecbcf360d8c966cd183771a7cc3cd8571..7b47c40236cdde6c939e51de67e71a35117b8260 100644
index f60bc17cf25211bf0c9007307c54821aecc7bb96..3b8d35ef70703f47f554cbbe6637924103595f6f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -37,8 +37,8 @@ index 813ce4cecbcf360d8c966cd183771a7cc3cd8571..7b47c40236cdde6c939e51de67e71a35
import static net.pl3x.purpur.PurpurConfig.log;
@@ -201,6 +203,22 @@ public class PurpurWorldConfig {
bambooSmallHeight = getInt("blocks.bamboo.small-height", bambooSmallHeight);
@@ -194,6 +196,22 @@ public class PurpurWorldConfig {
});
}
+ public boolean bedExplode = true;

4
patches/server/0086-Implement-respawn-anchor-explosion-options.patch → patches/server/0085-Implement-respawn-anchor-explosion-options.patch
View File

@@ -30,10 +30,10 @@ index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac
public static boolean a(World world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7b47c40236cdde6c939e51de67e71a35117b8260..91d7d123be1f5ffa12710bab56788b330dc3ba37 100644
index 3b8d35ef70703f47f554cbbe6637924103595f6f..6a8b0cb12c9465e5047a4b5e4c2ee667c9a6c12f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -240,6 +240,22 @@ public class PurpurWorldConfig {
@@ -233,6 +233,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

4
patches/server/0087-Add-allow-water-in-end-world-option.patch → patches/server/0086-Add-allow-water-in-end-world-option.patch
View File

@@ -49,10 +49,10 @@ index 120bf8436fd82294c339add2e7bff1cda8311aea..848a185c04aa90a62e6bcc49ad68a748
return true;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9..7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c 100644
index f91d9a19b3d9870c99a03c86eb835b8ec68cc133..70870b0af64ff9cac7a211cce7cc6ab2497a62ea 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1639,4 +1639,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1641,4 +1641,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final boolean isDebugWorld() {
return this.debugWorld;
}

2
patches/server/0088-Allow-color-codes-in-books.patch → patches/server/0087-Allow-color-codes-in-books.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9679c53c9252502dab3e69eaf5c2be0c22943959..781998b444a0687eab7593c2438ea060539e9f2b 100644
index 1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11..9b05adc3a834ce1f063c3b00505faed5e4ff66ba 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1018,7 +1018,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0089-Entity-lifespan.patch → patches/server/0088-Entity-lifespan.patch
View File

@@ -92,7 +92,7 @@ index 1edc13647e0897541e9009e02e1510307e5f3a8f..60797203c0b2c8c3a7caaebe635d8f19
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 781998b444a0687eab7593c2438ea060539e9f2b..0ff4e1b7ba891a2c740136a962098c9c68410ab9 100644
index 9b05adc3a834ce1f063c3b00505faed5e4ff66ba..5db09c913d7a0c6feef4e3fa22b22235238721cb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2229,6 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -104,7 +104,7 @@ index 781998b444a0687eab7593c2438ea060539e9f2b..0ff4e1b7ba891a2c740136a962098c9c
event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 91d7d123be1f5ffa12710bab56788b330dc3ba37..2f326f88257f5a45deee872865211d15fc67fac6 100644
index 6a8b0cb12c9465e5047a4b5e4c2ee667c9a6c12f..681400a7010444019440ffaa98de1a50e2662485 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,6 +103,11 @@ public class PurpurWorldConfig {

4
patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch → patches/server/0089-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -17,7 +17,7 @@ index be5f2147e9cded85620a57a90c7d800262fc3d6e..699afb9759083b42fd0608a3417fd3d1
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 36be65f9a36ea1b35ffa882eec295e1f46021f0c..40d2494114348ea256883cb4e8ebd3e02b040b14 100644
index a86e29ff086a4fe8aa4e8395ba420c0aff8f0be0..4134d9a1e649c70164a28df615bb43e81e7a64d6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -2389,4 +2389,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -48,7 +48,7 @@ index 36be65f9a36ea1b35ffa882eec295e1f46021f0c..40d2494114348ea256883cb4e8ebd3e0
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2f326f88257f5a45deee872865211d15fc67fac6..73027d6eed7b93fa8b9f580235259a262d50b96d 100644
index 681400a7010444019440ffaa98de1a50e2662485..4c878b65a271b0a014408034b0137b8d98f118ca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -178,6 +178,11 @@ public class PurpurWorldConfig {

4
patches/server/0091-Squid-EAR-immunity.patch → patches/server/0090-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 73027d6eed7b93fa8b9f580235259a262d50b96d..de2d072b24ca5f77f118a405add7ee62a2aacc8d 100644
index 4c878b65a271b0a014408034b0137b8d98f118ca..c66aa809024cc351d68693c899f7741516555f4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -444,6 +444,11 @@ public class PurpurWorldConfig {
@@ -437,6 +437,11 @@ public class PurpurWorldConfig {
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
}

0
patches/server/0092-Configurable-end-spike-seed.patch → patches/server/0091-Configurable-end-spike-seed.patch
View File

0
patches/server/0093-Configurable-dungeon-seed.patch → patches/server/0092-Configurable-dungeon-seed.patch
View File

6
patches/server/0094-Phantoms-burn-in-light.patch → patches/server/0093-Phantoms-burn-in-light.patch
View File

@@ -70,10 +70,10 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index de2d072b24ca5f77f118a405add7ee62a2aacc8d..a3568dfbe10c01a5e6c6497e22069b0cd5a89571 100644
index c66aa809024cc351d68693c899f7741516555f4e..3ce43e93f07cf728c9b0cf6f717d9ec7342bcb9e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -399,6 +399,9 @@ public class PurpurWorldConfig {
@@ -392,6 +392,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -83,7 +83,7 @@ index de2d072b24ca5f77f118a405add7ee62a2aacc8d..a3568dfbe10c01a5e6c6497e22069b0c
private void phantomSettings() {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
@@ -415,6 +418,9 @@ public class PurpurWorldConfig {
@@ -408,6 +411,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0095-Configurable-villager-breeding.patch → patches/server/0094-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 894089d665e97da31c04c82aaae344b22f83de89..5d37cb14f9cb7e3a1491a3dbcf212926
private boolean fr() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a3568dfbe10c01a5e6c6497e22069b0cd5a89571..22a79a530a92f334a29bed0fe8186077fd57f723 100644
index 3ce43e93f07cf728c9b0cf6f717d9ec7342bcb9e..bf56ba540159525634309cfdf40842c0ebdaa517 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -462,6 +462,7 @@ public class PurpurWorldConfig {
@@ -455,6 +455,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index a3568dfbe10c01a5e6c6497e22069b0cd5a89571..22a79a530a92f334a29bed0fe8186077
private void villagerSettings() {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -470,6 +471,7 @@ public class PurpurWorldConfig {
@@ -463,6 +464,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

4
patches/server/0096-Redstone-deactivates-spawners.patch → patches/server/0095-Redstone-deactivates-spawners.patch
View File

@@ -26,10 +26,10 @@ index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407
public abstract BlockPosition b();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 22a79a530a92f334a29bed0fe8186077fd57f723..ec84ec5297e2f16daa0d343fd3cbac6a4604c13a 100644
index bf56ba540159525634309cfdf40842c0ebdaa517..be2ea6897e74440307561a81dd8ad4f74dd71a60 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -273,6 +273,11 @@ public class PurpurWorldConfig {
@@ -266,6 +266,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

2
patches/server/0097-Totems-work-in-inventory.patch → patches/server/0096-Totems-work-in-inventory.patch
View File

@@ -29,7 +29,7 @@ index 699afb9759083b42fd0608a3417fd3d17ce8f560..f1e1db97d611192ff2d4b635ef81cf59
event.setCancelled(itemstack == null);
this.world.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec84ec5297e2f16daa0d343fd3cbac6a4604c13a..48c8cbf95be6bea2ceec48fe33d4219eab65bc0c 100644
index be2ea6897e74440307561a81dd8ad4f74dd71a60..9a9d56db381af4d99ebd0bfff54ce5ac04e2d768 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -183,6 +183,11 @@ public class PurpurWorldConfig {

2
patches/server/0098-Fix-death-message-colors.patch → patches/server/0097-Fix-death-message-colors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 40d2494114348ea256883cb4e8ebd3e02b040b14..d8cb09e809e382c48071d8abc3d952ca4ef64c9b 100644
index 4134d9a1e649c70164a28df615bb43e81e7a64d6..5696bd0ce51acb45b57d84106e9b00bc041f548b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -852,7 +852,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0099-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch → patches/server/0098-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0ff4e1b7ba891a2c740136a962098c9c68410ab9..8bcf0b7dd90087c86f0b4a81b31f4942c5653dbc 100644
index 5db09c913d7a0c6feef4e3fa22b22235238721cb..e2f97fa2b350c56c7086d89b4f66d07f3668e479 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1988,7 +1988,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

0
patches/server/0100-Populator-seed-controls.patch → patches/server/0099-Populator-seed-controls.patch
View File

2
patches/server/0101-Add-vindicator-johnny-spawn-chance.patch → patches/server/0100-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -22,7 +22,7 @@ index c0d26aa9dcd02c44d744b10e18609857ada95889..8f812aa9133e29d1450ab210fec68b23
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 48c8cbf95be6bea2ceec48fe33d4219eab65bc0c..a26529e932d442c9c9f4ca6a7eff5e3c5f842190 100644
index 9a9d56db381af4d99ebd0bfff54ce5ac04e2d768..affab8e21b8643e9965959561d4f125f75b845b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -40,6 +40,11 @@ public class PurpurWorldConfig {

0
patches/server/0102-DragonEggPlaceEvent.patch → patches/server/0101-DragonEggPlaceEvent.patch
View File

0
patches/server/0103-Add-option-to-disable-mushroom-block-updates.patch → patches/server/0102-Add-option-to-disable-mushroom-block-updates.patch
View File

4
patches/server/0104-Dispensers-place-anvils-option.patch → patches/server/0103-Dispensers-place-anvils-option.patch
View File

@@ -61,10 +61,10 @@ index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf1
static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a26529e932d442c9c9f4ca6a7eff5e3c5f842190..73969ac4480594b5c78cdb2c30fa4d49370a6a6d 100644
index affab8e21b8643e9965959561d4f125f75b845b9..73b96f608f4e388081f4d7372a0abaed537bf006 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -240,8 +240,10 @@ public class PurpurWorldConfig {
@@ -233,8 +233,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

8
patches/server/0105-Allow-anvil-colors.patch → patches/server/0104-Allow-anvil-colors.patch
View File

@@ -35,7 +35,7 @@ index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 73969ac4480594b5c78cdb2c30fa4d49370a6a6d..876a51801f6acdbc062de743106c5a63ed94b13c 100644
index 73b96f608f4e388081f4d7372a0abaed537bf006..40be126a94a56d2b8a6e8101bff9c74aae563c7d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -216,6 +216,11 @@ public class PurpurWorldConfig {
@@ -47,6 +47,6 @@ index 73969ac4480594b5c78cdb2c30fa4d49370a6a6d..876a51801f6acdbc062de743106c5a63
+ anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
+ }
+
public int bambooMaxHeight = 16;
public int bambooSmallHeight = 10;
private void bambooSettings() {
public boolean bedExplode = true;
public double bedExplosionPower = 5.0D;
public boolean bedExplosionFire = true;

2
patches/server/0106-Add-no-tick-block-list.patch → patches/server/0105-Add-no-tick-block-list.patch
View File

@@ -43,7 +43,7 @@ index 5db25b05565be541f07993092ba8e67c32d7cb18..44942f73c98e28821ee9d899733f44f4
this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
return fluidtype == null || fluidtype == FluidTypes.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 876a51801f6acdbc062de743106c5a63ed94b13c..4b96afcbf503d91c8dc7551dd8dfe445ffc5712b 100644
index 40be126a94a56d2b8a6e8101bff9c74aae563c7d..a9fc19ea44e2a46c1f116632e208c57e54077ad8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;

4
patches/server/0107-Add-option-to-disable-dolphin-treasure-searching.patch → patches/server/0106-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -17,10 +17,10 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4b96afcbf503d91c8dc7551dd8dfe445ffc5712b..9c7dec1b4ed0651a318f7234b8f075a923e78484 100644
index a9fc19ea44e2a46c1f116632e208c57e54077ad8..b17b839af84c475a2141af5168ff5dd2de3c3c5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -342,6 +342,11 @@ public class PurpurWorldConfig {
@@ -335,6 +335,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

0
patches/server/0108-Short-enderman-height.patch → patches/server/0107-Short-enderman-height.patch
View File

4
patches/server/0109-Stop-squids-floating-on-top-of-water.patch → patches/server/0108-Stop-squids-floating-on-top-of-water.patch
View File

@@ -43,10 +43,10 @@ index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634
protected void initPathfinder() {
this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c7dec1b4ed0651a318f7234b8f075a923e78484..5cc717c8d3829a1503fd53ae06f433a6e8f14894 100644
index b17b839af84c475a2141af5168ff5dd2de3c3c5d..3502db47aa65fb2be8e83ce64b4eb8914cf17554 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -490,8 +490,10 @@ public class PurpurWorldConfig {
@@ -483,8 +483,10 @@ public class PurpurWorldConfig {
}
public boolean squidImmuneToEAR = true;

54
patches/server/0110-Ridables.patch → patches/server/0109-Ridables.patch
View File

@@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d8cb09e809e382c48071d8abc3d952ca4ef64c9b..beb0a4b91a8abd0374ae40771009832ddf8978f7 100644
index 5696bd0ce51acb45b57d84106e9b00bc041f548b..3c748cca91e5f83701e6ae83f76e7548dad35420 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -3708,7 +3708,7 @@ index 7c39bec8314a3db63a90ccc9f040b82d754705e2..3f130e03bf8b235360385fd169d4886f
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index ced89af70ca791bfe42c4e2d21604997a0cf3e0f..4d5af11734eef45821a106873b58061ea6aa7db7 100644
index f73304240a626f3f7d9355e6e5f2963a06c4bb7d..ee4c26de15a5c304889f38f49f4584e8d4ccc5fe 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -3773,7 +3773,7 @@ index c872be77a6cd767520d5412b38ec4ed4fa87ac2f..96cb080d940db22330598a8806726088
protected void initPathfinder() {
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityPiglinAbstract.class, true));
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b5425a5d388 100644
index 8a1ff579ddf2fef191bc370dc51dd2e6404d9a22..3c14ed27e5b487451846f6811f189e6fba05d32d 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -34,12 +34,45 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -3822,7 +3822,7 @@ index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b54
this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, 10, true, false, (entityliving) -> {
return Math.abs(entityliving.locY() - this.locY()) <= 4.0D;
}));
@@ -324,11 +357,12 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -325,11 +358,12 @@ public class EntitySlime extends EntityInsentient implements IMonster {
}
@Override
@@ -3836,7 +3836,7 @@ index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b54
}
@Nullable
@@ -497,10 +531,10 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -498,10 +532,10 @@ public class EntitySlime extends EntityInsentient implements IMonster {
// Paper end
}
@@ -3849,7 +3849,7 @@ index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b54
private final EntitySlime k;
private boolean l;
@@ -522,15 +556,27 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -523,15 +557,27 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@Override
public void a() {
@@ -3879,7 +3879,7 @@ index e99fd88118a75f36cb93d02aa7c6029bcffd5f10..46026362981ce8a3a9e7d63e16230b54
if (this.j-- <= 0) {
this.j = this.k.eJ();
if (this.l) {
@@ -547,7 +593,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -548,7 +594,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
this.a.q(0.0F);
}
} else {
@@ -4798,7 +4798,7 @@ index e76e6ebde73b93dc06e76b71cdf6371c3654160a..d92fe8013fb3b43cb7eabdf1c624291b
this.eL();
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index b90ea31440fe49124bd2fb003884768ce8a1e528..e2f68d843c8eff2c6bcb7d2535af771a51be150e 100644
index a43f44bcf97b30d1cea2fb5d93e6949e41ab86fd..ba9b20863c12a1ba5a55013a74a34bc2fbc37273 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster {
@@ -4915,10 +4915,10 @@ index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..b9f8ed355421f24306e0cc2bb976589f
Entity entity1 = this.getShooter();
// Paper start - Cancel hit for vanished players
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dd1e083289b875f1b87ae2aa6179c7babaf79ad5..2374a7ee018493795389b21848289395168db422 100644
index 11e76719df539d39b1ecd8303a8d54319b00f182..22e84d2e08ad436c553dc7d99046adf9ee63e9f1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1411,6 +1411,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1406,6 +1406,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
WorldServer worldserver = (WorldServer) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
worldserver.hasEntityMoveEvent = net.pl3x.purpur.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
@@ -4973,7 +4973,7 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8bcf0b7dd90087c86f0b4a81b31f4942c5653dbc..3b32303b9e8c9c96938758c02ed72e3fea73a638 100644
index e2f97fa2b350c56c7086d89b4f66d07f3668e479..398f883b2e646dc8e90753270d1dece833a80739 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2246,6 +2246,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -5026,10 +5026,10 @@ index 5af554870bcf36e47aef43b966b141b9eda6c4d5..c59305ef7dd7847e204d4c4ed79758bf
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c..bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5 100644
index 70870b0af64ff9cac7a211cce7cc6ab2497a62ea..b91f3efb61575869d54d630263bb6a4c6499153e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1648,5 +1648,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1650,5 +1650,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean isTheEnd() {
return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
}
@@ -5071,7 +5071,7 @@ index 7854fa516fcb6c00838955c2aa20d73b9181aa90..a0d1a45c4dac6e4519231aa3d02939ee
public static int dungeonSeed = -1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f277be43e 100644
index 3502db47aa65fb2be8e83ce64b4eb8914cf17554..7ca7888d5e69c860f21ba51054ca1504e82bf216 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -5086,7 +5086,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
private ConfigurationSection getConfigurationSection(String path) {
ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
@@ -316,63 +311,188 @@ public class PurpurWorldConfig {
@@ -309,63 +304,188 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}
@@ -5275,7 +5275,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
public float giantStepHeight = 2.0F;
public float giantJumpHeight = 1.0F;
public double giantMovementSpeed = 0.5D;
@@ -381,6 +501,8 @@ public class PurpurWorldConfig {
@@ -374,6 +494,8 @@ public class PurpurWorldConfig {
public boolean giantHaveHostileAI = false;
public double giantMaxHealth = 100.0D;
private void giantSettings() {
@@ -5284,7 +5284,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed);
@@ -395,19 +517,44 @@ public class PurpurWorldConfig {
@@ -388,19 +510,44 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}
@@ -5329,7 +5329,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed);
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
@@ -418,11 +565,76 @@ public class PurpurWorldConfig {
@@ -411,11 +558,76 @@ public class PurpurWorldConfig {
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
}
@@ -5406,7 +5406,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -442,6 +654,11 @@ public class PurpurWorldConfig {
@@ -435,6 +647,11 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
private void phantomSettings() {
@@ -5418,7 +5418,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
@@ -462,40 +679,184 @@ public class PurpurWorldConfig {
@@ -455,40 +672,184 @@ public class PurpurWorldConfig {
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
}
@@ -5603,7 +5603,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerCanBeLeashed = false;
@@ -505,6 +866,8 @@ public class PurpurWorldConfig {
@@ -498,6 +859,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
private void villagerSettings() {
@@ -5612,7 +5612,7 @@ index 5cc717c8d3829a1503fd53ae06f433a6e8f14894..a222cd43afb5668c71e88f001e89da0f
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
@@ -515,45 +878,108 @@ public class PurpurWorldConfig {
@@ -508,45 +871,108 @@ public class PurpurWorldConfig {
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
}
@@ -6383,10 +6383,10 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 3f678fde45919061dfc75030b7ce355b4dda9e3a..182e3258cdce99139c229e99cfbc54f23b7dfa77 100644
index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c5e2e72d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -506,6 +506,18 @@ public class CraftEventFactory {
@@ -498,6 +498,18 @@ public class CraftEventFactory {
}
craftServer.getPluginManager().callEvent(event);
@@ -6405,7 +6405,7 @@ index 3f678fde45919061dfc75030b7ce355b4dda9e3a..182e3258cdce99139c229e99cfbc54f2
return event;
}
@@ -906,6 +918,7 @@ public class CraftEventFactory {
@@ -898,6 +910,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -6413,7 +6413,7 @@ index 3f678fde45919061dfc75030b7ce355b4dda9e3a..182e3258cdce99139c229e99cfbc54f2
}
event.setCancelled(cancelled);
@@ -990,6 +1003,7 @@ public class CraftEventFactory {
@@ -982,6 +995,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -6421,7 +6421,7 @@ index 3f678fde45919061dfc75030b7ce355b4dda9e3a..182e3258cdce99139c229e99cfbc54f2
return event;
}
@@ -1039,6 +1053,7 @@ public class CraftEventFactory {
@@ -1031,6 +1045,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);

0
patches/server/0111-Use-configured-height-for-nether-surface-builders.patch → patches/server/0110-Use-configured-height-for-nether-surface-builders.patch
View File

0
patches/server/0112-Crying-obsidian-valid-for-portal-frames.patch → patches/server/0111-Crying-obsidian-valid-for-portal-frames.patch
View File

2
patches/server/0113-Entities-can-use-portals-configuration.patch → patches/server/0112-Entities-can-use-portals-configuration.patch
View File

@@ -27,7 +27,7 @@ index 0be1f47b13f617a7aaad4d6334929d9e5f943d3e..b882c049870e461472fe3252922f206c
public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a222cd43afb5668c71e88f001e89da0f277be43e..1025b5daef29da23f1a80c1c0a1ef0eeee18384e 100644
index 7ca7888d5e69c860f21ba51054ca1504e82bf216..bda0d06dd8d0fc07a313285d714eab55815310d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -140,6 +140,7 @@ public class PurpurWorldConfig {

0
patches/server/0114-LivingEntity-broadcastItemBreak.patch → patches/server/0113-LivingEntity-broadcastItemBreak.patch
View File

4
patches/server/0115-Customizable-wither-health-and-healing.patch → patches/server/0114-Customizable-wither-health-and-healing.patch
View File

@@ -44,10 +44,10 @@ index f68cf834aa65cc4bbb1eb9901586395d41770955..71b6fc480617f040029b2201f24d05af
//this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1025b5daef29da23f1a80c1c0a1ef0eeee18384e..0f2e0e779198765a7dfa2d4c56b8b2ff8fb08f96 100644
index bda0d06dd8d0fc07a313285d714eab55815310d1..6c50bcc45a4208b1709290944d57793e6f47dcd4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -910,10 +910,21 @@ public class PurpurWorldConfig {
@@ -903,10 +903,21 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;

4
patches/server/0116-Allow-toggling-special-MobSpawners-per-world.patch → patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -29,7 +29,7 @@ index 8d89f51182444852062d549d23c00a93e601eb38..072ec40f751b19c2a78dfcc6e439c643
if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5..ab97d076c921e1fd3ba69ed4b93d43e930d54bfc 100644
index b91f3efb61575869d54d630263bb6a4c6499153e..22a5a212b8f0a223a338a8476d9fc7fd36c19df5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -72,7 +72,7 @@ index d5f1808b232869ed5db8161345a03bf79fd159b7..78259bbb90fbd46bfd7922b9844339ff
this.worldDataServer = (WorldDataServer) iworlddataserver;
worldDataServer.world = this;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0f2e0e779198765a7dfa2d4c56b8b2ff8fb08f96..92a1fb69e58237780fe03afcd5fc2ed16657345b 100644
index 6c50bcc45a4208b1709290944d57793e6f47dcd4..b0a0c6cc6b781130cbfd02edc6c5b511090099c0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;

2
patches/server/0117-Raid-cooldown-setting.patch → patches/server/0116-Raid-cooldown-setting.patch
View File

@@ -52,7 +52,7 @@ index 826dcf9f7eedc3664d66170b97b2a19552a0dc60..807910c60e6cad58b91474b0477e6fc1
if (!this.raids.containsKey(raid.getId())) {
this.raids.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 92a1fb69e58237780fe03afcd5fc2ed16657345b..19e43dd63cd3001b927eb5857002231073bc03a2 100644
index b0a0c6cc6b781130cbfd02edc6c5b511090099c0..8a2724489df13cf04200b1f34b3a76e0cdd679d3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -155,6 +155,7 @@ public class PurpurWorldConfig {

2
patches/server/0118-Despawn-rate-config-options-per-projectile-type.patch → patches/server/0117-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -300,7 +300,7 @@ index b9f8ed355421f24306e0cc2bb976589f4b72b548..58f03f1d2e2f9e4c072c727ae202a9e3
public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 19e43dd63cd3001b927eb5857002231073bc03a2..7dcc0211b0e5ab359b2cabfeee0f3f442835b5e1 100644
index 8a2724489df13cf04200b1f34b3a76e0cdd679d3..843c57d41106d31ae81f7e926c186db48462cf52 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,35 @@ public class PurpurWorldConfig {

0
patches/server/0119-PaperPR-Add-hex-color-code-support-for-console-loggi.patch → patches/server/0118-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
View File

6
patches/server/0120-Add-option-to-disable-zombie-aggressiveness-towards-.patch → patches/server/0119-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -45,7 +45,7 @@ index 125eab60f2b4657e52a71eddf7586c574945252e..638efc67d66001ee085957d4698f51a7
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index e2f68d843c8eff2c6bcb7d2535af771a51be150e..3ad8bd0847aacabf90e83c00cd7c1a8f51aaa2e4 100644
index ba9b20863c12a1ba5a55013a74a34bc2fbc37273..1c1816f6f08c2b02aba6db2e78863fabe83674d9 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -85,7 +85,18 @@ public class EntityZombie extends EntityMonster {
@@ -69,10 +69,10 @@ index e2f68d843c8eff2c6bcb7d2535af771a51be150e..3ad8bd0847aacabf90e83c00cd7c1a8f
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7dcc0211b0e5ab359b2cabfeee0f3f442835b5e1..f04e2e562fb07ca0f1b4ac4e25fdb050554b5431 100644
index 843c57d41106d31ae81f7e926c186db48462cf52..c6a09b44b5f7289d81a2fd82f91135a8c2932e1f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1012,12 +1012,14 @@ public class PurpurWorldConfig {
@@ -1005,12 +1005,14 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;

2
patches/server/0121-Persistent-TileEntity-Lore-and-DisplayName.patch → patches/server/0120-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -165,7 +165,7 @@ index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8c
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f04e2e562fb07ca0f1b4ac4e25fdb050554b5431..4d97a232351a2a70f8992ff1d8d93b1fb976029a 100644
index c6a09b44b5f7289d81a2fd82f91135a8c2932e1f..9f26c73dc6685ede1681a6b2ede8c35ccb2580f4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -182,6 +182,7 @@ public class PurpurWorldConfig {

0
patches/server/0122-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch → patches/server/0121-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
View File

4
patches/server/0123-Flying-squids-Oh-my.patch → patches/server/0122-Flying-squids-Oh-my.patch
View File

@@ -38,10 +38,10 @@ index 70b952f10a2af547f58069977ee135469d02f84d..cee226501690e1c00983a01ac82bc738
float f1 = MathHelper.cos(f) * 0.2F;
float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d97a232351a2a70f8992ff1d8d93b1fb976029a..70e8092aff0ffb0b37c969cde0572069fd50112a 100644
index 9f26c73dc6685ede1681a6b2ede8c35ccb2580f4..de6b4d078c1b41300bf570d7b6fb0b02e979049c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -868,10 +868,12 @@ public class PurpurWorldConfig {
@@ -861,10 +861,12 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;

2
patches/server/0124-Infinity-bow-settings.patch → patches/server/0123-Infinity-bow-settings.patch
View File

@@ -26,7 +26,7 @@ index dd6a93dc78a4589f2c65d1738c432def1285f3e2..8241f3dafa5852bed7a3967e7260b36f
entityhuman.b(StatisticList.ITEM_USED.b(this));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 70e8092aff0ffb0b37c969cde0572069fd50112a..5b007f26d91c04681bb5b57494c22fb5ba072405 100644
index de6b4d078c1b41300bf570d7b6fb0b02e979049c..aa648cc1e1d05d38ce81d201e31541c49e9a05bb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,15 @@ public class PurpurWorldConfig {

4
patches/server/0125-Stonecutter-damage.patch → patches/server/0124-Stonecutter-damage.patch
View File

@@ -39,10 +39,10 @@ index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926df
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5b007f26d91c04681bb5b57494c22fb5ba072405..403a503bca872c76c760c89143255228f54654dd 100644
index aa648cc1e1d05d38ce81d201e31541c49e9a05bb..e853f0e33313cbb7a8f72affebf82476f9eb7f5a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -372,6 +372,11 @@ public class PurpurWorldConfig {
@@ -365,6 +365,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

6
patches/server/0126-Configurable-daylight-cycle.patch → patches/server/0125-Configurable-daylight-cycle.patch
View File

@@ -5,13 +5,13 @@ Subject: [PATCH] Configurable daylight cycle
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..fed1ce95038ead72a663f5a562dd4628fa51e5f5 100644
index 1b9b43ee696575d986c25cafec07d863acb951a7..e837db171545ceacbc84a2b360cf0d95347145d0 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
@@ -5,7 +5,7 @@ import java.io.IOException;
public class PacketPlayOutUpdateTime implements Packet<PacketListenerPlayOut> {
private long a;
private long a; private final void setWorldAge(final long age) { this.a = age; } private final long getWorldAge() { return this.a; } // Paper - OBFHELPER
- private long b;
+ private long b; public void setPlayerTime(long time) { this.b = time; } // Purpur
@@ -74,7 +74,7 @@ index 78259bbb90fbd46bfd7922b9844339ff0a4c0342..98d7686b15bbd5f75676e4391a241d59
public void doMobSpawning(boolean flag, boolean flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 403a503bca872c76c760c89143255228f54654dd..2136325349c1073b2103da9c6481bd87b6085833 100644
index e853f0e33313cbb7a8f72affebf82476f9eb7f5a..bf403f3d02fe63df4e17ec461cc818861cc956a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {

0
patches/server/0127-Allow-infinite-and-mending-enchantments-together.patch → patches/server/0126-Allow-infinite-and-mending-enchantments-together.patch
View File

10
patches/server/0128-Infinite-fuel-furnace.patch → patches/server/0127-Infinite-fuel-furnace.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Infinite fuel furnace
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 1d3c2dd93657fb5dc71ee6b444c585b54619d1e8..1a47f0ae48acca8badc418838bb767bb6fbddbcb 100644
index e75e676d196d9f5a3409ec50645fab611b0afdad..76ea1d003b43d822e2b85eec3b8740155efd531a 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -266,6 +266,22 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -278,6 +278,22 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
if (!this.world.isClientSide) {
ItemStack itemstack = (ItemStack) this.items.get(1);
@@ -31,7 +31,7 @@ index 1d3c2dd93657fb5dc71ee6b444c585b54619d1e8..1a47f0ae48acca8badc418838bb767bb
if (!this.isBurning() && (itemstack.isEmpty() || ((ItemStack) this.items.get(0)).isEmpty())) {
if (!this.isBurning() && this.cookTime > 0) {
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
@@ -319,6 +335,8 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -331,6 +347,8 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
flag1 = true;
this.world.setTypeAndData(this.position, (IBlockData) this.world.getType(this.position).set(BlockFurnace.LIT, this.isBurning()), 3);
}
@@ -41,10 +41,10 @@ index 1d3c2dd93657fb5dc71ee6b444c585b54619d1e8..1a47f0ae48acca8badc418838bb767bb
if (flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2136325349c1073b2103da9c6481bd87b6085833..1dea0f8c04bb730e8d0643718845824047e6caf9 100644
index bf403f3d02fe63df4e17ec461cc818861cc956a3..07519a988c61b23904f5c70becbc6c525456c39f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -340,6 +340,11 @@ public class PurpurWorldConfig {
@@ -333,6 +333,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

0
patches/server/0129-Arrows-should-not-reset-despawn-counter.patch → patches/server/0128-Arrows-should-not-reset-despawn-counter.patch
View File

2
patches/server/0130-Add-tablist-suffix-option-for-afk.patch → patches/server/0129-Add-tablist-suffix-option-for-afk.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index beb0a4b91a8abd0374ae40771009832ddf8978f7..3906805c5d6b9203e1ad160207154493660c8188 100644
index 3c748cca91e5f83701e6ae83f76e7548dad35420..d677b4477a871790377348a112fa267181a70cda 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1972,7 +1972,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
patches/server/0131-Ability-to-re-add-farmland-mechanics-from-Alpha.patch → patches/server/0130-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index 8dd48669c29dd51ed4d535dad0b0319f4bb2250c..099e0d3df219408ebe2a741a02e53eb9
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1dea0f8c04bb730e8d0643718845824047e6caf9..90368559d64615bb9df3c5d8c4ec23289df09ddd 100644
index 07519a988c61b23904f5c70becbc6c525456c39f..bdbf949e3cbef495bcbfb7d8b97a88107b7d110f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -336,8 +336,10 @@ public class PurpurWorldConfig {
@@ -329,8 +329,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

4
patches/server/0132-Add-adjustable-breeding-cooldown-to-config.patch → patches/server/0131-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -33,7 +33,7 @@ index bba343542e7e6fa83ec802d97b4c139bb210ab28..d9f9e2235d091e14e5d34bb9a3273e7f
int experience = this.getRandom().nextInt(7) + 1;
org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ab97d076c921e1fd3ba69ed4b93d43e930d54bfc..b4ba9b56a9964cefcb24044890855697ce726a08 100644
index 22a5a212b8f0a223a338a8476d9fc7fd36c19df5..7021875fd8f205049748fe96b945de8339f3ec58 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -104,6 +104,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -94,7 +94,7 @@ index ab97d076c921e1fd3ba69ed4b93d43e930d54bfc..b4ba9b56a9964cefcb24044890855697
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90368559d64615bb9df3c5d8c4ec23289df09ddd..a108545c74c9cc7b280eb33637cbe869de72a0f5 100644
index bdbf949e3cbef495bcbfb7d8b97a88107b7d110f..309d15804eb7e5087805724c401461375b4745cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -202,6 +202,7 @@ public class PurpurWorldConfig {

34
patches/server/0133-Make-animal-breeding-times-configurable.patch → patches/server/0132-Make-animal-breeding-times-configurable.patch
View File

@@ -398,10 +398,10 @@ index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe2f56f00c 100644
index 309d15804eb7e5087805724c401461375b4745cc..ef0c2320780c623df4dd638c9272110a2fb2e530 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 {
@@ -416,10 +416,12 @@ public class PurpurWorldConfig {
public boolean beeRidable = false;
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
@@ -414,7 +414,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean blazeRidable = false;
@@ -443,12 +445,14 @@ public class PurpurWorldConfig {
@@ -436,12 +438,14 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -429,7 +429,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean caveSpiderRidable = false;
@@ -461,10 +465,12 @@ public class PurpurWorldConfig {
@@ -454,10 +458,12 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public boolean chickenRetaliate = false;
@@ -442,7 +442,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean codRidable = false;
@@ -475,10 +481,12 @@ public class PurpurWorldConfig {
@@ -468,10 +474,12 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public int cowFeedMushrooms = 0;
@@ -455,7 +455,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean creeperRidable = false;
@@ -506,8 +514,10 @@ public class PurpurWorldConfig {
@@ -499,8 +507,10 @@ public class PurpurWorldConfig {
}
public boolean donkeyRidableInWater = false;
@@ -466,7 +466,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean drownedRidable = false;
@@ -567,10 +577,12 @@ public class PurpurWorldConfig {
@@ -560,10 +570,12 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public boolean foxTypeChangesWithTulips = false;
@@ -479,7 +479,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean ghastRidable = false;
@@ -615,14 +627,18 @@ public class PurpurWorldConfig {
@@ -608,14 +620,18 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
@@ -498,7 +498,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean huskRidable = false;
@@ -667,9 +683,11 @@ public class PurpurWorldConfig {
@@ -660,9 +676,11 @@ public class PurpurWorldConfig {
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
@@ -510,7 +510,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean llamaTraderRidable = false;
@@ -688,28 +706,36 @@ public class PurpurWorldConfig {
@@ -681,28 +699,36 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
@@ -547,7 +547,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean parrotRidable = false;
@@ -773,10 +799,12 @@ public class PurpurWorldConfig {
@@ -766,10 +792,12 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public boolean pigGiveSaddleBack = false;
@@ -560,7 +560,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean piglinRidable = false;
@@ -804,12 +832,14 @@ public class PurpurWorldConfig {
@@ -797,12 +825,14 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = false;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -575,7 +575,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean pufferfishRidable = false;
@@ -821,11 +851,13 @@ public class PurpurWorldConfig {
@@ -814,11 +844,13 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -589,7 +589,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean ravagerRidable = false;
@@ -842,9 +874,11 @@ public class PurpurWorldConfig {
@@ -835,9 +867,11 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
@@ -601,7 +601,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean shulkerRidable = false;
@@ -922,9 +956,11 @@ public class PurpurWorldConfig {
@@ -915,9 +949,11 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
@@ -613,7 +613,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean tropicalFishRidable = false;
@@ -934,9 +970,11 @@ public class PurpurWorldConfig {
@@ -927,9 +963,11 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
@@ -625,7 +625,7 @@ index a108545c74c9cc7b280eb33637cbe869de72a0f5..992a0babbed1eee0c0d566612b54adfe
}
public boolean vexRidable = false;
@@ -1029,9 +1067,11 @@ public class PurpurWorldConfig {
@@ -1022,9 +1060,11 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;

14
patches/server/0134-Apply-display-names-from-item-forms-of-entities-to-e.patch → patches/server/0133-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -25,7 +25,7 @@ index faa221038df6bed02a2433855ed7c7e0f89c6024..6efe59e0385e144c59804e9e5e18e691
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index d53bbe31694c2d88939332691cdf145c46099e22..bc558c54c9e74e2158a5835173e6068cfaeffcc0 100644
index 4f95976f9a852fa89cedd1fe81d2077fe5d118ee..0254a9e971b2dd93436a38815bfd1dcca9a2ec67 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -155,7 +155,13 @@ public class EntityBoat extends Entity {
@@ -34,7 +34,7 @@ index d53bbe31694c2d88939332691cdf145c46099e22..bc558c54c9e74e2158a5835173e6068c
if (!flag && this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {
- this.a((IMaterial) this.g());
+ // Purpur start
+ final ItemStack boat = new ItemStack(this.getMaterialForType());
+ final ItemStack boat = new ItemStack(this.getBoatItem());
+ if (this.world.purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
+ boat.setName(this.getCustomName());
+ }
@@ -43,14 +43,6 @@ index d53bbe31694c2d88939332691cdf145c46099e22..bc558c54c9e74e2158a5835173e6068c
}
this.die();
@@ -216,6 +222,7 @@ public class EntityBoat extends Entity {
}
+ public Item getMaterialForType() { return this.g(); } // Purpur - OBFHELPER
public Item g() {
switch (this.getType()) {
case OAK:
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 4b524c2165e95a4d3d78b84b7b15416a4ea7d622..d1ed9856d3362e1bed37d60c268b7e91c404d25d 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -196,7 +188,7 @@ index 623bcb93cbdf0f67ee999104936f9d60c5228037..eb115a9c2aac9abe28d36f6284ca84f6
NBTTagCompound nbttagcompound = this.a("display");
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 992a0babbed1eee0c0d566612b54adfe2f56f00c..af3f910e639a17dbcade8609a3c8c42b0d138cbb 100644
index ef0c2320780c623df4dd638c9272110a2fb2e530..458aa1882da2015928c334e0f40b14ee36ba667d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,8 +83,10 @@ public class PurpurWorldConfig {

2
patches/server/0135-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch → patches/server/0134-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
View File

@@ -21,7 +21,7 @@ index 01163ce38602f9345f00ee0535b4e73be7c6d735..a7efce97318fcf95d98f33ad4ac2da69
((EntityInsentient) entityliving).setPersistent();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index af3f910e639a17dbcade8609a3c8c42b0d138cbb..a77debc7a8923693733d748ce9abd3ae2d057fb9 100644
index 458aa1882da2015928c334e0f40b14ee36ba667d..d4e876fb5dc5f405d5a06982589bf8b4e05b2394 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -84,9 +84,11 @@ public class PurpurWorldConfig {

4
patches/server/0136-Add-twisting-and-weeping-vines-growth-rates.patch → patches/server/0135-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@@ -67,10 +67,10 @@ index 23dca1940375d243531fc4a891f04e937ae2f48f..94ffadb91fec65a721cf0c8fa98bad70
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a77debc7a8923693733d748ce9abd3ae2d057fb9..a7eb31a3ed80ebe6bfc7d4187734d9bcbe9b537e 100644
index d4e876fb5dc5f405d5a06982589bf8b4e05b2394..cf6fa370ce968a882311f1403556cea618c7c7fe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,6 +408,16 @@ public class PurpurWorldConfig {
@@ -401,6 +401,16 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0137-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch → patches/server/0136-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -89,10 +89,10 @@ index 94ffadb91fec65a721cf0c8fa98bad708a2ca269..067df63ab27ecb9fe0a0d012b16efbd5
// Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a7eb31a3ed80ebe6bfc7d4187734d9bcbe9b537e..9b91ae1186a057722cc84173a43e9d1138c8a8ca 100644
index cf6fa370ce968a882311f1403556cea618c7c7fe..91ba7f0b3ddb2846119e4b74ba501f6b40938702 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -355,6 +355,11 @@ public class PurpurWorldConfig {
@@ -348,6 +348,11 @@ public class PurpurWorldConfig {
furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
}
@@ -104,7 +104,7 @@ index a7eb31a3ed80ebe6bfc7d4187734d9bcbe9b537e..9b91ae1186a057722cc84173a43e9d11
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;
public int lavaSpeedNether = 10;
@@ -409,13 +414,17 @@ public class PurpurWorldConfig {
@@ -402,13 +407,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

4
patches/server/0138-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch → patches/server/0137-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,10 +21,10 @@ index 995849212c25568d3aa28ada78babf8b8e669960..acb2b3ed04ea0bf19335415310ce22cd
static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9b91ae1186a057722cc84173a43e9d1138c8a8ca..d14a4955e5e2fc805b8fb6b46c9750ccc9955df0 100644
index 91ba7f0b3ddb2846119e4b74ba501f6b40938702..5df5f771dfcdd01386600531defa4ab1b612160b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -579,10 +579,12 @@ public class PurpurWorldConfig {
@@ -572,10 +572,12 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;

4
patches/server/0139-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch → patches/server/0138-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
View File

@@ -33,10 +33,10 @@ index 9963cef9298eb6d3e2ee6a24d9b1998e765123ac..a72ce4ea5a45fce35a47fd5f9c21b950
if (flag5) {
if (i > 0) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 182e3258cdce99139c229e99cfbc54f23b7dfa77..eec1e49f615f8491b28b6a921c192ffae803b478 100644
index 3edc530ec688047ae037303442a16e8c5e2e72d4..0d9c4d2a427a3484db1f87476be43c03dd36621d 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1052,7 +1052,7 @@ public class CraftEventFactory {
@@ -1044,7 +1044,7 @@ public class CraftEventFactory {
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
EntityDamageEvent event;
if (damager != null) {

2
patches/server/0140-Add-configurable-snowball-damage.patch → patches/server/0139-Add-configurable-snowball-damage.patch
View File

@@ -18,7 +18,7 @@ index 34a5f481e6ed1357861dca15fb4013ec8484a292..d7bab4446a5a8eef98c10b1f6eb89de9
entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d14a4955e5e2fc805b8fb6b46c9750ccc9955df0..effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4 100644
index 5df5f771dfcdd01386600531defa4ab1b612160b..478184f94b146419f9a3107b4f8fd3b08e914588 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -196,6 +196,11 @@ public class PurpurWorldConfig {

6
patches/server/0141-Zombie-break-door-minimum-difficulty-option.patch → patches/server/0140-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -40,7 +40,7 @@ index 7488a12926c5ee4adc3bc1fa3973988350381544..23870a271b759a953a095df835e08ea2
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4..ee7b5efcfc0e185f0dfec50054ff53ee46d48d59 100644
index 478184f94b146419f9a3107b4f8fd3b08e914588..e6ca3585b8b34311ae2596b610e85953f1cf2a13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -51,7 +51,7 @@ index effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4..ee7b5efcfc0e185f0dfec50054ff53ee
import net.minecraft.server.Explosion;
import net.minecraft.server.IRegistry;
import net.minecraft.server.Item;
@@ -1119,6 +1120,7 @@ public class PurpurWorldConfig {
@@ -1112,6 +1113,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -59,7 +59,7 @@ index effcabfd6b4cfb0ff2bdf058b60923f2162d9ce4..ee7b5efcfc0e185f0dfec50054ff53ee
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1126,6 +1128,11 @@ public class PurpurWorldConfig {
@@ -1119,6 +1121,11 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

0
patches/server/0142-Add-demo-command.patch → patches/server/0141-Add-demo-command.patch
View File

0
patches/server/0143-Left-handed-API.patch → patches/server/0142-Left-handed-API.patch
View File

0
patches/server/0144-Origami-Fix-ProtocolLib-issues-on-Java-15.patch → patches/server/0143-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
View File

2
patches/server/0145-Changeable-Mob-Left-Handed-Chance.patch → patches/server/0144-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -18,7 +18,7 @@ index d1ed9856d3362e1bed37d60c268b7e91c404d25d..d7ceb4ff6aa424d620817ddcc9201fc0
} else {
this.setLeftHanded(false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ee7b5efcfc0e185f0dfec50054ff53ee46d48d59..090a8c681c4288bff1efef1f782d2bf36abaef77 100644
index e6ca3585b8b34311ae2596b610e85953f1cf2a13..b426fffac370530ee8ae5c0134fc24bdfb9dcf39 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -129,8 +129,10 @@ public class PurpurWorldConfig {

4
patches/server/0146-Add-boat-fall-damage-config.patch → patches/server/0145-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3906805c5d6b9203e1ad160207154493660c8188..50cd947d0e47e7897a071fdf8ff6e5834e137d58 100644
index d677b4477a871790377348a112fa267181a70cda..157300c0320a136d36994d463a69a5b0fe022683 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1030,7 +1030,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -27,7 +27,7 @@ index 3906805c5d6b9203e1ad160207154493660c8188..50cd947d0e47e7897a071fdf8ff6e583
if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 090a8c681c4288bff1efef1f782d2bf36abaef77..1e5dc4366ccc85002e9b0ea0cfbcde46d39017d2 100644
index b426fffac370530ee8ae5c0134fc24bdfb9dcf39..472db0b81c6b072941a64d2e2f0cf2aebd3408b7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,6 +206,7 @@ public class PurpurWorldConfig {

2
patches/server/0147-Config-migration-disable-saving-projectiles-to-disk-.patch → patches/server/0146-Config-migration-disable-saving-projectiles-to-disk-.patch
View File

@@ -36,7 +36,7 @@ index 4709fe0db33d64406c3c52991626a377f0a8cf93..0c1f22249061f600fce2d4d627f0683f
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1e5dc4366ccc85002e9b0ea0cfbcde46d39017d2..d2c07bd07406f324a79b0543101cb2d391fa8dec 100644
index 472db0b81c6b072941a64d2e2f0cf2aebd3408b7..12a4a4b2874212a192ed05498a0238e3615cd548 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,6 @@

4
patches/server/0148-Snow-Golem-rate-of-fire-config.patch → patches/server/0147-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b
this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d2c07bd07406f324a79b0543101cb2d391fa8dec..7f40f118723e04491d48227304fb7b1758ed7d0e 100644
index 12a4a4b2874212a192ed05498a0238e3615cd548..823e72736110e3ef13aa763a1a94ce759a6d5f76 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -970,12 +970,20 @@ public class PurpurWorldConfig {
@@ -963,12 +963,20 @@ public class PurpurWorldConfig {
public boolean snowGolemLeaveTrailWhenRidden = false;
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemPutPumpkinBack = false;

4
patches/server/0149-PaperPR-Config-option-for-Piglins-guarding-chests.patch → patches/server/0148-PaperPR-Config-option-for-Piglins-guarding-chests.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 2452f54d96cab2d93140c64e25d9b799cbc94caa..3ff2fa66b940acbe8e72fb03bf7a86398ab69613 100644
index 0bca517b4948cd55bfbf3ba4d5c1b3cd895cc086..b21da8af71fa6af82156aa83d983e99c6ac6502a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -669,6 +669,11 @@ public class PaperWorldConfig {
@@ -686,6 +686,11 @@ public class PaperWorldConfig {
zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
}

0
patches/server/0150-EMC-Configurable-disable-give-dropping.patch → patches/server/0149-EMC-Configurable-disable-give-dropping.patch
View File

2
patches/server/0151-Config-migration-climbing-should-not-bypass-cramming.patch → patches/server/0150-Config-migration-climbing-should-not-bypass-cramming.patch
View File

@@ -28,7 +28,7 @@ index 4ea4abc4f03123fa4be7e19b777d4afa0d2002ae..dbda80c9a57dc7a1882a00020b407dd6
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7f40f118723e04491d48227304fb7b1758ed7d0e..f57d0e48fbf8ff54f1a033ccb2302c29038c3a09 100644
index 823e72736110e3ef13aa763a1a94ce759a6d5f76..1c9aaf92e8c2f23f1d65f42fb044a2183b99e214 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,17 @@ public class PurpurWorldConfig {

6
patches/server/0152-Lobotomize-stuck-villagers.patch → patches/server/0151-Lobotomize-stuck-villagers.patch
View File

@@ -88,10 +88,10 @@ index b92ca4a6de01f3f86367fb8dfe3591b08a3e9218..1208464fba96daf276c9cc0c1c9b18db
// Paper start - add target parameter
return this.a(blockposition, null, i);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f57d0e48fbf8ff54f1a033ccb2302c29038c3a09..71ce16f714ed903ae7a466f815d59dcb1757ea86 100644
index 1c9aaf92e8c2f23f1d65f42fb044a2183b99e214..99e4cce00d644dd7bb2183058847380c2046889c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1064,6 +1064,8 @@ public class PurpurWorldConfig {
@@ -1057,6 +1057,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -100,7 +100,7 @@ index f57d0e48fbf8ff54f1a033ccb2302c29038c3a09..71ce16f714ed903ae7a466f815d59dcb
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1075,6 +1077,13 @@ public class PurpurWorldConfig {
@@ -1068,6 +1070,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);

Some files were not shown because too many files have changed in this diff Show More