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

100

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-25 07:20:00 -05:00
parent 70d2462a46
commit 8e59077b65
12 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/unapplied/server/0091-Allow-anvil-colors.patch → patches/server/0091-Allow-anvil-colors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index ca8dd8b7f7bf8826472f11cb9472cf84c0368f34..1d3534589e1977c14e01e29c5570fe0ec0ee0a88 100644
index 3751ce065a38cb55b0800f000e33b2b32c7e0f5d..c8b6c5c65a4cd3a53b300358513f96acdaaba449 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -2,6 +2,9 @@ package net.minecraft.world.inventory;
@@ -16,9 +16,9 @@ index ca8dd8b7f7bf8826472f11cb9472cf84c0368f34..1d3534589e1977c14e01e29c5570fe0e
+import io.papermc.paper.adventure.PaperAdventure;
+import net.kyori.adventure.text.format.TextDecoration;
import net.minecraft.nbt.IntTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
@@ -277,6 +280,17 @@ public class AnvilMenu extends ItemCombinerMenu {
import net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket;
@@ -276,6 +279,17 @@ public class AnvilMenu extends ItemCombinerMenu {
} else if (!this.itemName.equals(itemstack.getHoverName().getString())) {
b1 = 1;
i += b1;
@@ -33,7 +33,7 @@ index ca8dd8b7f7bf8826472f11cb9472cf84c0368f34..1d3534589e1977c14e01e29c5570fe0e
+ itemstack1.setHoverName(PaperAdventure.asVanilla(renameTextComponent));
+ } else
+ // Purpur end
itemstack1.setHoverName((Component) (new TextComponent(this.itemName)));
itemstack1.setHoverName(new TextComponent(this.itemName));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java

10
patches/unapplied/server/0093-Add-option-to-disable-dolphin-treasure-searching.patch → patches/server/0092-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index 855ab63797baf825eeaddb4892cbe8430d47da0f..cc20ed6e1746f47351eb9b40f7b3c1a11daebd4f 100644
index f34e1c342562a509539f2176a91e6132cd6672b2..27747e712a5964b43a7fe1d11165740b38e58dd6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -497,6 +497,7 @@ public class Dolphin extends WaterAnimal {
@@ -477,6 +477,7 @@ public class Dolphin extends WaterAnimal {
@Override
public boolean canUse() {
@@ -17,10 +17,10 @@ index 855ab63797baf825eeaddb4892cbe8430d47da0f..cc20ed6e1746f47351eb9b40f7b3c1a1
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 56b5ddbab362d2c6bd9402211d30e01b94b2e891..6d1c934cb11de4a2c5c92e058f0118de4da3e2f1 100644
index 730abc3bc780ccbd22b9e8c33a2ea894f53f13ee..92d567ee59d18fe6e202774dd5b91980cca37ec5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -574,6 +574,7 @@ public class PurpurWorldConfig {
@@ -552,6 +552,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index 56b5ddbab362d2c6bd9402211d30e01b94b2e891..6d1c934cb11de4a2c5c92e058f0118de
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -585,6 +586,7 @@ public class PurpurWorldConfig {
@@ -563,6 +564,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

14
patches/unapplied/server/0094-Short-enderman-height.patch → patches/server/0093-Short-enderman-height.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Short enderman height
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 3aeeba4465a5ff551a56ac50e23036074f9315c3..06feb2e4729bf188c783d1b105d02bc41af4263c 100644
index d143282263dd371cc3128a42da8a43ffab7d3f40..ff41e900df2fda703ad48acf0b989c3647801240 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -280,7 +280,8 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -279,7 +279,8 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
private Component description;
@Nullable
private ResourceLocation lootTable;
@@ -17,19 +17,19 @@ index 3aeeba4465a5ff551a56ac50e23036074f9315c3..06feb2e4729bf188c783d1b105d02bc4
+ public void setDimensions(EntityDimensions dimensions) { this.dimensions = dimensions; } // Purpur
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
return (EntityType) Registry.register((Registry) Registry.ENTITY_TYPE, id, (Object) type.build(id));
return (EntityType) Registry.register(Registry.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index ec772f1ec312c3e51287d86eb2023cee80e55d7b..b9f8969cbe24661a5fa5fb4b46fdd159b76005cc 100644
index 71b472e3fefe549fe959fda1702213bac3c3e7d4..490b8d674a0f1ae75de89fcadb2894da55c32d4e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -393,6 +393,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -399,6 +399,7 @@ public class EnderMan extends Monster implements NeutralMob {
if (this.isInvulnerableTo(source)) {
return false;
} else if (getRider() != null) { return super.hurt(source, amount); // Purpur - no teleporting on damage
+ } else if (net.pl3x.purpur.PurpurConfig.endermanShortHeight && source == DamageSource.IN_WALL) { return false; // Purpur - no suffocation damage if short height
} else if (source instanceof IndirectEntityDamageSource) {
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
for (int i = 0; i < 64; ++i) {
Entity entity = source.getDirectEntity();
boolean flag;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c55f0be5437f36d42dacb2e61efcecac3cf379ee..ee78e74edb95f29c42ae94e733fd44043191206e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

20
patches/unapplied/server/0095-Stop-squids-floating-on-top-of-water.patch → patches/server/0094-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 87b9812c7c879403792c9a5a91366af7a63bc683..49c622253d70c8a3e60881d91cf09085458eebcf 100644
index 0c1b9a69b9e90f68b466865a0cd8e6632ecd988a..94601ee45d3d1e2829e25dc318f49e2dc7ff2d70 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3881,6 +3881,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3793,6 +3793,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
this.yRotO = this.getYRot();
}
@@ -18,14 +18,14 @@ index 87b9812c7c879403792c9a5a91366af7a63bc683..49c622253d70c8a3e60881d91cf09085
+ }
+ // Purpur end
+
public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double d0) {
public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double speed) {
if (this.touchingUnloadedChunk()) {
return false;
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index 8f0583a32156b5dcfe0eb6351ce6a0ce341d1e13..af13adb96a083c83b7b847770a85e32bd0eafa4b 100644
index bb3792988864bb5fe7841c2cbdb583cb8e6fa489..82d657e431a5a2317e5be80f3b2898a5c7371a42 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -79,6 +79,12 @@ public class Squid extends WaterAnimal {
@@ -76,6 +76,12 @@ public class Squid extends WaterAnimal {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.squidMaxHealth);
}
@@ -39,10 +39,10 @@ index 8f0583a32156b5dcfe0eb6351ce6a0ce341d1e13..af13adb96a083c83b7b847770a85e32b
@Override
diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java
index 68cc6f2a78a06293a29317fda72ab3ee79b3533a..cfb2e46b34b2982d6724f18214557fc80cf4adfa 100644
index 120498a39b7ca7aee9763084507508d4a1c425aa..0dfc639043998cd3bd32afaaf8153459172cc9f9 100644
--- a/src/main/java/net/minecraft/world/phys/AABB.java
+++ b/src/main/java/net/minecraft/world/phys/AABB.java
@@ -367,4 +367,10 @@ public class AABB {
@@ -356,4 +356,10 @@ public class AABB {
public static AABB ofSize(Vec3 center, double dx, double dy, double dz) {
return new AABB(center.x - dx / 2.0D, center.y - dy / 2.0D, center.z - dz / 2.0D, center.x + dx / 2.0D, center.y + dy / 2.0D, center.z + dz / 2.0D);
}
@@ -54,10 +54,10 @@ index 68cc6f2a78a06293a29317fda72ab3ee79b3533a..cfb2e46b34b2982d6724f18214557fc8
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6d1c934cb11de4a2c5c92e058f0118de4da3e2f1..99e55295b4ad0128e427d0014b9f8fbbfa819954 100644
index 92d567ee59d18fe6e202774dd5b91980cca37ec5..c768239b89fba36920a0b6ac926de2584efa7c19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1334,6 +1334,7 @@ public class PurpurWorldConfig {
@@ -1312,6 +1312,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index 6d1c934cb11de4a2c5c92e058f0118de4da3e2f1..99e55295b4ad0128e427d0014b9f8fbb
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1343,6 +1344,7 @@ public class PurpurWorldConfig {
@@ -1321,6 +1322,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

2
patches/unapplied/server/0097-Crying-obsidian-valid-for-portal-frames.patch → patches/server/0095-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Crying obsidian valid for portal frames
diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
index d3ae4835b53071e92fe9613cd92907e232e71ba0..153ed3b6e5bd5bbbd94e91aa9c71d84156d4a258 100644
index 5d76674d5e181f012c0686e9915556bc93087706..4a7626819fe7c3cad694072b9ae5737175550ed4 100644
--- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
+++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
@@ -31,7 +31,7 @@ public class PortalShape {

8
patches/unapplied/server/0098-Entities-can-use-portals-configuration.patch → patches/server/0096-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 49c622253d70c8a3e60881d91cf09085458eebcf..1630e3bcbcd799060b80cdd19ef37ae648425029 100644
index 94601ee45d3d1e2829e25dc318f49e2dc7ff2d70..42e7d6d431591cf0edf8f3aa05a4ccf3b788c7b5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2719,7 +2719,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2629,7 +2629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 49c622253d70c8a3e60881d91cf09085458eebcf..1630e3bcbcd799060b80cdd19ef37ae6
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3370,7 +3370,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3282,7 +3282,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
public boolean canChangeDimensions() {
@@ -27,7 +27,7 @@ index 49c622253d70c8a3e60881d91cf09085458eebcf..1630e3bcbcd799060b80cdd19ef37ae6
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 99e55295b4ad0128e427d0014b9f8fbbfa819954..058e2045b4717ab65fc14097154ee57ad461ce45 100644
index c768239b89fba36920a0b6ac926de2584efa7c19..2bc7177f0435e93ff8964b74e590be51181a2613 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -287,6 +287,7 @@ public class PurpurWorldConfig {

2
patches/unapplied/server/0099-LivingEntity-broadcastItemBreak.patch → patches/server/0097-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 916d487372efdbf68a383f4ae761cccd75e0a1d8..be1f7cf667b5c9b2e691397bfc2e316b7ba84251 100644
index 1dcfe129ec3633de67404ab5ab72cdcee31d3d9d..eb61eab2b7be4f99b827a0e206db23a858fa2119 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -931,5 +931,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

10
patches/unapplied/server/0100-Customizable-wither-health-and-healing.patch → patches/server/0098-Customizable-wither-health-and-healing.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing
Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index 43de1fa753e54ae09d43a9aef8dda22c27c67b81..ff71f78497681805246d7b3e4ac59288db9af997 100644
index 54ea9f591d31f3503a67b3b10f9f737843c03b79..10883671cb28e579445f17c7ed729a0edb987bac 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -504,8 +504,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -515,8 +515,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
}
}
@@ -23,10 +23,10 @@ index 43de1fa753e54ae09d43a9aef8dda22c27c67b81..ff71f78497681805246d7b3e4ac59288
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 058e2045b4717ab65fc14097154ee57ad461ce45..0f3c9233fb4761a394b301a634373b95949d5c48 100644
index 2bc7177f0435e93ff8964b74e590be51181a2613..df725904e7682dd08049815c8bd226c318ecdf0d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1545,6 +1545,8 @@ public class PurpurWorldConfig {
@@ -1523,6 +1523,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 058e2045b4717ab65fc14097154ee57ad461ce45..0f3c9233fb4761a394b301a634373b95
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1559,6 +1561,8 @@ public class PurpurWorldConfig {
@@ -1537,6 +1539,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

16
patches/unapplied/server/0101-Allow-toggling-special-MobSpawners-per-world.patch → patches/server/0099-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 2acd254df2f16c4f8d95cb240d62033e9ebc67bf..3417921d0409e410b0e26742832e3083c58e4409 100644
index 963c249f2bcf2a264c9e4cd0961f11bb08f54d12..7c84f20ce15525c4b8af4f03e3d67af08f8e1a03 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -81,6 +81,7 @@ import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.ReputationEventHandler;
import net.minecraft.world.entity.ai.navigation.PathNavigation;
import net.minecraft.world.entity.ai.village.ReputationEventType;
@@ -17,7 +17,7 @@ index 2acd254df2f16c4f8d95cb240d62033e9ebc67bf..3417921d0409e410b0e26742832e3083
import net.minecraft.world.entity.ai.village.poi.PoiManager;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.entity.animal.Animal;
@@ -90,7 +91,9 @@ import net.minecraft.world.entity.animal.WaterAnimal;
@@ -88,7 +89,9 @@ import net.minecraft.world.entity.animal.WaterAnimal;
import net.minecraft.world.entity.animal.horse.SkeletonHorse;
import net.minecraft.world.entity.boss.EnderDragonPart;
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
@@ -27,7 +27,7 @@ index 2acd254df2f16c4f8d95cb240d62033e9ebc67bf..3417921d0409e410b0e26742832e3083
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.raid.Raid;
import net.minecraft.world.entity.raid.Raids;
@@ -130,6 +133,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
@@ -127,6 +130,8 @@ import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.gameevent.GameEventListenerRegistrar;
import net.minecraft.world.level.gameevent.vibrations.VibrationPath;
import net.minecraft.world.level.levelgen.Heightmap;
@@ -35,8 +35,8 @@ index 2acd254df2f16c4f8d95cb240d62033e9ebc67bf..3417921d0409e410b0e26742832e3083
+import net.minecraft.world.level.levelgen.PhantomSpawner;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.level.levelgen.structure.StructureStart;
@@ -505,7 +510,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
import net.minecraft.world.level.levelgen.structure.StructureCheck;
@@ -493,7 +498,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.dragonParts = new Int2ObjectOpenHashMap();
this.tickTime = flag1;
this.server = minecraftserver;
@@ -63,7 +63,7 @@ index 2acd254df2f16c4f8d95cb240d62033e9ebc67bf..3417921d0409e410b0e26742832e3083
this.serverLevelData = (PrimaryLevelData) iworlddataserver;
serverLevelData.world = this;
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f24524f44 100644
index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166c5745987 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
@@ -5,6 +5,7 @@ import java.util.Optional;
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0f3c9233fb4761a394b301a634373b95949d5c48..18ccb5cfc298975581416c5ee5e6f4b4befaaf04 100644
index df725904e7682dd08049815c8bd226c318ecdf0d..cecb81cbed1018dfa3a1088682c8828dd9fd8c36 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -73,6 +73,12 @@ public class PurpurWorldConfig {

12
patches/unapplied/server/0102-Raid-cooldown-setting.patch → patches/server/0100-Raid-cooldown-setting.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Raid cooldown setting
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea6f6a2475 100644
index e8dd1fdf1a3b697a2e040424df49ac6527b68312..120f77f52ef493f16c2bd8fbc8d8d0a4271560e7 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raids.java
@@ -28,6 +28,7 @@ import net.minecraft.world.phys.Vec3;
@@ -27,6 +27,7 @@ import net.minecraft.world.phys.Vec3;
public class Raids extends SavedData {
private static final String RAID_FILE_ID = "raids";
@@ -16,7 +16,7 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
public final Map<Integer, Raid> raidMap = Maps.newHashMap();
private final ServerLevel level;
private int nextAvailableID;
@@ -45,6 +46,17 @@ public class Raids extends SavedData {
@@ -44,6 +45,17 @@ public class Raids extends SavedData {
public void tick() {
++this.tick;
@@ -34,7 +34,7 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
Iterator iterator = this.raidMap.values().iterator();
while (iterator.hasNext()) {
@@ -128,10 +140,15 @@ public class Raids extends SavedData {
@@ -127,10 +139,15 @@ public class Raids extends SavedData {
if (flag) {
// CraftBukkit start
@@ -52,7 +52,7 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.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 18ccb5cfc298975581416c5ee5e6f4b4befaaf04..62d404aed69465556a7e03938a23d9b3040be265 100644
index cecb81cbed1018dfa3a1088682c8828dd9fd8c36..7ee1e9b23b17288bef4f9dda8b2865142d4b466b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -313,6 +313,7 @@ public class PurpurWorldConfig {
@@ -70,4 +70,4 @@ index 18ccb5cfc298975581416c5ee5e6f4b4befaaf04..62d404aed69465556a7e03938a23d9b3
+ raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
}
public Set<Block> noRandomTickBlocks = new HashSet<>();
public boolean anvilAllowColors = false;

2
patches/unapplied/server/0092-Add-no-random-tick-block-list.patch
View File

@@ -3,6 +3,8 @@ From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Aug 2020 12:53:36 -0500
Subject: [PATCH] Add no-random-tick block list
block predicated removed - i'm sure they put it somewhere
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 168caca104d6ee4b4cca6dde973166d8e47a29ba..2acd254df2f16c4f8d95cb240d62033e9ebc67bf 100644

1
patches/unapplied/server/0096-Use-configured-height-for-nether-surface-builders.patch
View File

@@ -3,6 +3,7 @@ From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 15 Aug 2020 06:51:46 -0500
Subject: [PATCH] Use configured height for nether surface builders
full worldgen change
diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
index cdfbdb411eacf5f8c6ced2dbc5789e0d49b93e1f..e4013f241a5e9aeb334dadde8b55c7e6ca32233c 100644