Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 02:25:51 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Paper/Purpur/Airplane) (#398)

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

Purpur Changes:
be941d8 Updated Upstream (Paper)
e968763 Vanilla snowman now drops pumpking when sheared

Airplane Changes:
a1d0b30 Merge branch 'master' of github.com:Technove/AirplaneLite
a84798e Disable Paper timings by default
fac3db8 Create funding.yml
360636b Merge in perf/misc

Paper Changes:
bd7c1d88b Merchant#getRecipes should return an immutable list (#5183)
This commit is contained in:
Simon Gardling 2021-02-11 12:41:36 -05:00 committed by GitHub
parent 1cf37d8d90
commit 4527fdcbbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 310 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PATCHES.md
View File

@ -93,6 +93,7 @@ # Patches
| server | Breedable Polar Bears | William Blake Galbreath | |
| server | Bring back server name | William Blake Galbreath | |
| api | Bring back server name | William Blake Galbreath | |
| server | Cache palette array | Paul Sauve | |
| server | Cat spawning options | William Blake Galbreath | |
| server | Change writes to use NORMAL priority rather than LOW | Spottedleaf | |
| server | Changeable Mob Left Handed Chance | Ben Kerllenevich | |
@ -305,6 +306,8 @@ # Patches
| server | Redirect Configs | tr7zw | |
| server | Redstone deactivates spawners | draycia | |
| server | Reduce allocation rate from crammed entities | Spottedleaf | |
| server | Reduce allocs & improve perf of StructureManager | Paul Sauve | |
| server | Reduce chunk loading & lookups | Paul Sauve | |
| server | Reduce iterator allocation from chunk gen | Spottedleaf | |
| server | Reduce pathfinder branches | Spottedleaf | |
| server | Reduce projectile chunk loading | Paul Sauve | |

2
Paper

@ -1 +1 @@
Subproject commit 3dadd97bbc9f622c62c5a6d885fe9453a003cbe6
Subproject commit bd7c1d88b1262eaba4a37a96774332e8aec4608c

76
patches/Airplane/patches/server/0013-Reduce-allocs-improve-perf-of-StructureManager.patch Normal file
View File

@ -0,0 +1,76 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@technove.co>
Date: Thu, 4 Feb 2021 23:24:20 -0600
Subject: [PATCH] Reduce allocs & improve perf of StructureManager
Focuses on two methods, getStructureStarts & getFeatureStarts. For
getStructureStarts, it inlines getFeatureStarts so it doesn't have to
calculate an entire list when it returns early. As well, it uses a
LongIterator in order to not allocate longs for each position.
diff --git a/src/main/java/net/minecraft/server/StructureManager.java b/src/main/java/net/minecraft/server/StructureManager.java
index 2598ae3710d46c2cfd2be5d6be2a56e59ceef6ea..fd1f1e2d7e4be227697f534bdc6d9c52ceeeda4b 100644
--- a/src/main/java/net/minecraft/server/StructureManager.java
+++ b/src/main/java/net/minecraft/server/StructureManager.java
@@ -5,6 +5,11 @@ import it.unimi.dsi.fastutil.objects.ObjectArrayList; // Paper
import java.util.stream.Stream;
import javax.annotation.Nullable;
+// Airplane start
+import it.unimi.dsi.fastutil.longs.LongIterator;
+import it.unimi.dsi.fastutil.longs.LongSet;
+// Airplane end
+
public class StructureManager {
private final GeneratorAccess a; public GeneratorAccess getLevel() { return a; } // Paper - OBFHELPER
@@ -41,13 +46,15 @@ public class StructureManager {
public java.util.List<StructureStart<?>> getFeatureStarts(SectionPosition sectionPosition, StructureGenerator<?> structureGenerator, IWorldReader world) {
// Tuinity end - add world parameter
java.util.List<StructureStart<?>> list = new ObjectArrayList<>();
- for (Long curLong: (world == null ? getLevel() : world).getChunkAt(sectionPosition.a(), sectionPosition.c(), ChunkStatus.STRUCTURE_REFERENCES).b(structureGenerator)) { // Tuinity - fix deadlock on world gen - chunk can be unloaded while generating, so we should be using the generator's regionlimitedaccess so we always get the chunk
- SectionPosition sectionPosition1 = SectionPosition.a(new ChunkCoordIntPair(curLong), 0);
+ // Airplane start - skip allocating Longs
+ (world == null ? getLevel() : world).getChunkAt(sectionPosition.a(), sectionPosition.c(), ChunkStatus.STRUCTURE_REFERENCES).b(structureGenerator).forEach((java.util.function.LongConsumer) curLong -> {
+ SectionPosition sectionPosition1 = SectionPosition.a(ChunkCoordIntPair.getX(curLong), 0, ChunkCoordIntPair.getZ(curLong)); // don't allocate ChunkCoordIntPair
StructureStart<?> structurestart = a(sectionPosition1, structureGenerator, getLevel().getChunkAt(sectionPosition1.a(), sectionPosition1.c(), ChunkStatus.STRUCTURE_STARTS));
if (structurestart != null && structurestart.e()) {
list.add(structurestart);
}
- }
+ });
+ // Airplane end
return list;
}
// Paper end
@@ -75,7 +82,18 @@ public class StructureManager {
}
public StructureStart<?> getStructureStarts(BlockPosition blockposition, boolean flag, StructureGenerator<?> structuregenerator, IWorldReader world) {
// Paper start - remove structure streams
- for (StructureStart<?> structurestart : getFeatureStarts(SectionPosition.a(blockposition), structuregenerator, world)) { // Tuinity end - add world parameter
+ // Airplane start - inline getFeatureStarts to skip creating the list
+ SectionPosition sectionPosition = SectionPosition.a(blockposition);
+
+ // use iterator here instead of forEach like in getFeatureStarts so we can return early
+ LongSet longSet = (world == null ? getLevel() : world).getChunkAt(sectionPosition.a(), sectionPosition.c(), ChunkStatus.STRUCTURE_REFERENCES).b(structuregenerator);
+ LongIterator iterator = longSet.iterator();
+ while (iterator.hasNext()) {
+ long curLong = iterator.nextLong();
+ SectionPosition sectionPosition1 = SectionPosition.a(ChunkCoordIntPair.getX(curLong), 0, ChunkCoordIntPair.getZ(curLong)); // don't allocate ChunkCoordIntPair
+ StructureStart<?> structurestart = a(sectionPosition1, structuregenerator, getLevel().getChunkAt(sectionPosition1.a(), sectionPosition1.c(), ChunkStatus.STRUCTURE_STARTS));
+ if (structurestart != null && structurestart.e()) {
+
if (structurestart.c().b(blockposition)) {
if (!flag) {
return structurestart;
@@ -86,7 +104,10 @@ public class StructureManager {
}
}
}
+
+ }
}
+ // Airplane end
return StructureStart.a;
// Paper end
}

60
patches/Airplane/patches/server/0014-Cache-palette-array.patch Normal file
View File

@ -0,0 +1,60 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@technove.co>
Date: Thu, 4 Feb 2021 23:28:46 -0600
Subject: [PATCH] Cache palette array
The reasoning for reusing it in ChunkRegionLoader is because ThreadLocal
lookups are fairly expensive, and if we put it in DataPaletteBlock the
ThreadLocal lookup would happen 18 times.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 5f04591193d58ba7897194142da5efcbec3763dd..e77da341b765725771726283d3a8249b514b40da 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -424,6 +424,7 @@ public class ChunkRegionLoader {
public static NBTTagCompound saveChunk(WorldServer worldserver, IChunkAccess ichunkaccess) {
return saveChunk(worldserver, ichunkaccess, null);
}
+ private static final ThreadLocal<int[]> paletteArray = ThreadLocal.withInitial(() -> new int[4096]); // Airplane
public static NBTTagCompound saveChunk(WorldServer worldserver, IChunkAccess ichunkaccess, AsyncSaveData asyncsavedata) {
// Paper end
// Tuinity start - rewrite light impl
@@ -454,6 +455,7 @@ public class ChunkRegionLoader {
NBTTagCompound nbttagcompound2;
+ int[] aint = paletteArray.get(); // Airplane - use cached
for (int i = -1; i < 17; ++i) { // Paper - conflict on loop parameter change
int finalI = i; // CraftBukkit - decompile errors
ChunkSection chunksection = (ChunkSection) Arrays.stream(achunksection).filter((chunksection1) -> {
@@ -474,7 +476,7 @@ public class ChunkRegionLoader {
nbttagcompound2 = new NBTTagCompound();
nbttagcompound2.setByte("Y", (byte) (i & 255));
if (chunksection != Chunk.a) {
- chunksection.getBlocks().a(nbttagcompound2, "Palette", "BlockStates");
+ chunksection.getBlocks().a(nbttagcompound2, "Palette", "BlockStates", aint); // Airplane
}
if (nibblearray != null && !nibblearray.c()) {
diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
index 73163b417af7e522a4509bf9c1ab56d6499be622..2855a2757c35afc5751a7ca6f3a12cc27c24bf96 100644
--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -226,12 +226,16 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
this.b();
}
+ // Airplane start - add parameter for reusing aint
public synchronized void a(NBTTagCompound nbttagcompound, String s, String s1) { // Paper - synchronize
+ a(nbttagcompound, s, s1, new int[4096]);
+ }
+ public synchronized void a(NBTTagCompound nbttagcompound, String s, String s1, int[] aint) { // Paper - synchronize // Airplane end
this.a();
DataPaletteHash<T> datapalettehash = new DataPaletteHash<>(this.d, this.i, this.c, this.e, this.f);
T t0 = this.g;
int i = datapalettehash.a(this.g);
- int[] aint = new int[4096];
+ //int[] aint = new int[4096]; // Airplane - use parameter
for (int j = 0; j < 4096; ++j) {
T t1 = this.a(j);

47
patches/Airplane/patches/server/0015-Reduce-chunk-loading-lookups.patch Normal file
View File

@ -0,0 +1,47 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@technove.co>
Date: Thu, 4 Feb 2021 23:33:52 -0600
Subject: [PATCH] Reduce chunk loading & lookups
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index b884addf2ce6f1ef7394658078deb2e75370654f..e20b91b36587d1191f8f9e8dd501607bf085e76d 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -279,11 +279,18 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
private boolean p(double d0, double d1, double d2) {
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(d0, d1, d2);
- while (blockposition_mutableblockposition.getY() > 0 && !this.world.getType(blockposition_mutableblockposition).getMaterial().isSolid()) {
+ // Airplane start - single chunk lookup
+ Chunk chunk = this.world.getChunkIfLoaded(blockposition_mutableblockposition);
+ if (chunk == null) {
+ return false;
+ }
+
+ while (blockposition_mutableblockposition.getY() > 0 && !chunk.getType(blockposition_mutableblockposition).getMaterial().isSolid()) { // use chunk lookup
blockposition_mutableblockposition.c(EnumDirection.DOWN);
}
- IBlockData iblockdata = this.world.getType(blockposition_mutableblockposition);
+ IBlockData iblockdata = chunk.getType(blockposition_mutableblockposition); // use chunk lookup
+ // Airplane end
boolean flag = iblockdata.getMaterial().isSolid();
boolean flag1 = iblockdata.getFluid().a((Tag) TagsFluid.WATER);
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index ee91c33a7a2edca02caf5c71fd6429f97eac7e2d..324b78a51557cdd97e125f22eff8a4f54153d9f4 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -372,7 +372,10 @@ public final class SpawnerCreature {
}
private static List<BiomeSettingsMobs.c> a(WorldServer worldserver, StructureManager structuremanager, ChunkGenerator chunkgenerator, EnumCreatureType enumcreaturetype, BlockPosition blockposition, @Nullable BiomeBase biomebase) {
- return enumcreaturetype == EnumCreatureType.MONSTER && worldserver.getType(blockposition.down()).getBlock() == Blocks.NETHER_BRICKS && structuremanager.a(blockposition, false, StructureGenerator.FORTRESS).e() ? StructureGenerator.FORTRESS.c() : chunkgenerator.getMobsFor(biomebase != null ? biomebase : worldserver.getBiome(blockposition), structuremanager, enumcreaturetype, blockposition);
+ // Airplane start - single chunk lookup
+ Chunk chunk;
+ return enumcreaturetype == EnumCreatureType.MONSTER && (chunk = worldserver.getChunkIfLoaded(blockposition)) != null && chunk.getType(blockposition.down()).getBlock() == Blocks.NETHER_BRICKS && structuremanager.a(blockposition, false, StructureGenerator.FORTRESS).e() ? StructureGenerator.FORTRESS.c() : chunkgenerator.getMobsFor(biomebase != null ? biomebase : worldserver.getBiome(blockposition), structuremanager, enumcreaturetype, blockposition);
+ // Airplane end
}
private static BlockPosition getRandomPosition(World world, Chunk chunk) {

5
patches/Purpur/patches/server/0016-Player-invulnerabilities.patch
View File

@ -2,12 +2,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
~/m/Y/Y/Yatopia-Server   Purpur-server 
git diff 92c905f952344875c7d00766f45cd8fb228cdef2 78a263e978c5dfdb26e09dd72b25d9d3dc0b1c8b
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7d7a512ad752e15fbe0edce47da1da76c01df3b3..9b09d68435290add2781a72e5bc62ce50a79e39f 100644

37
patches/Purpur/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch
View File

@ -5,34 +5,15 @@ Subject: [PATCH] Snowman drop and put back pumpkin
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 48997367a67ffd1dbf29cdb048720610528f35cb..95ee716fc9b79b5fcb8508118b3876c51f3f6987 100644
index 48997367a67ffd1dbf29cdb048720610528f35cb..51396cbd18d0e053e788f82bf4a3bc2533f20e11 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity {
+ private static final RecipeItemStack PUMPKIN = RecipeItemStack.a(Blocks.PUMPKIN.getItem(), Blocks.CARVED_PUMPKIN.getItem(), Blocks.JACK_O_LANTERN.getItem()); // Purpur
private static final DataWatcherObject<Byte> b = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a);
public EntitySnowman(EntityTypes<? extends EntitySnowman> entitytypes, World world) {
@@ -120,9 +121,25 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
itemstack.damage(1, entityhuman, (entityhuman1) -> {
entityhuman1.broadcastItemBreak(enumhand);
});
+ // Purpur start
+ if (world.purpurConfig.snowGolemDropsPumpkin) {
+ EntityItem pumpkin = new EntityItem(world, locX(), locY(), locZ(), new ItemStack(Blocks.CARVED_PUMPKIN.getItem()));
+ pumpkin.pickupDelay = 10;
+ world.addEntity(pumpkin);
+ return EnumInteractionResult.SUCCESS;
+ }
+ // Purpur end
@@ -123,6 +123,14 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
}
return EnumInteractionResult.a(this.world.isClientSide);
+ // Purpur start
+ } else if (world.purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && PUMPKIN.test(itemstack)) {
+ } else if (world.purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
+ setHasPumpkin(true);
+ if (!entityhuman.abilities.canInstantlyBuild) {
+ itemstack.subtract(1);
@ -42,15 +23,23 @@ index 48997367a67ffd1dbf29cdb048720610528f35cb..95ee716fc9b79b5fcb8508118b3876c5
} else {
return EnumInteractionResult.PASS;
}
@@ -133,6 +141,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
this.world.playSound((EntityHuman) null, (Entity) this, SoundEffects.ENTITY_SNOW_GOLEM_SHEAR, soundcategory, 1.0F, 1.0F);
if (!this.world.s_()) {
this.setHasPumpkin(false);
+ if (world.purpurConfig.snowGolemDropsPumpkin) // Purpur
this.a(new ItemStack(Items.dj), 1.7F);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 24ef91788ff69004eed1b136a0ceb6176db00e76..6d93ff4b08582f0f3ea1bb4b582aaa881651d34d 100644
index 24ef91788ff69004eed1b136a0ceb6176db00e76..609307a409365829e61430da47aa75125afcb8c4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -208,6 +208,13 @@ public class PurpurWorldConfig {
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
}
+ public boolean snowGolemDropsPumpkin = false;
+ public boolean snowGolemDropsPumpkin = true;
+ public boolean snowGolemPutPumpkinBack = false;
+ private void snowGolemSettings() {
+ snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);

2
patches/Purpur/patches/server/0043-Ender-dragon-always-drop-full-exp.patch
View File

@ -18,7 +18,7 @@ index de53af8c01f8fa9636386737b6bc071b32f87cd1..a5a2182455542bb8fd62941bd0da2f38
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6d93ff4b08582f0f3ea1bb4b582aaa881651d34d..55cc0c4bafe35b9d8bb15bd017d5ea429a427e60 100644
index 609307a409365829e61430da47aa75125afcb8c4..66c0725c3dc28e49387d2b9f1a15aa0758763c08 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -142,6 +142,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0044-Signs-editable-on-right-click.patch
View File

@ -39,7 +39,7 @@ index 2b9d5724c1b63f5e55010f9e3450004821c098a4..316766970243e8ac00e4c82f6c710de5
// Paper start
//this.c = entityhuman;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 55cc0c4bafe35b9d8bb15bd017d5ea429a427e60..e5a160ef0a193445cf42f1569109a502d2fe52d4 100644
index 66c0725c3dc28e49387d2b9f1a15aa0758763c08..8393a0253ac16a8f15f78288d6cc31f8688c403c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -109,6 +109,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0045-Signs-allow-color-codes.patch
View File

@ -59,7 +59,7 @@ index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc9
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e5a160ef0a193445cf42f1569109a502d2fe52d4..e73b493c67b53273330dbf7abbda2ace54a169f4 100644
index 8393a0253ac16a8f15f78288d6cc31f8688c403c..484da2bf267cab4e4569c98111398af64c834eed 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -109,8 +109,10 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@ -36,7 +36,7 @@ index a315e2628c35ee713b68741c6e52c4b140c05f27..8dd48669c29dd51ed4d535dad0b0319f
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e73b493c67b53273330dbf7abbda2ace54a169f4..3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6 100644
index 484da2bf267cab4e4569c98111398af64c834eed..56793a9e8f963b63a22aac5337299fbfb07389f0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -109,6 +109,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0047-Controllable-Minecarts.patch
View File

@ -143,7 +143,7 @@ index ceef7aaf923026ff1044d6feba4297279eb44157..002651aaf3b8a9b489fe323756cd1ad1
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6..248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c 100644
index 56793a9e8f963b63a22aac5337299fbfb07389f0..c6682064ff5d653d14f658396a6a5461d4554fab 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,7 @@

2
patches/Purpur/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch
View File

@ -20,7 +20,7 @@ index 4e2149b422a643bd30c8d8d13adc9e5f5f2a8cca..762f65d7e12c020f4acdc8a0a9a10299
// CraftBukkit start - Call death event
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c..6b3c1a07497f8c5f06ac7ed7df31fc8224f94007 100644
index c6682064ff5d653d14f658396a6a5461d4554fab..8d1ad37f17935331ee867c15f91842cdc53d4450 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch
View File

@ -19,7 +19,7 @@ index fcf254bbaeb3c0ffdb6834a8d5ad2c3cf4235e5b..79554e18fc39ecd9db87618a59d2e670
return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6b3c1a07497f8c5f06ac7ed7df31fc8224f94007..b2ad6265a9e2bb16592fb9719339be83d92ff82b 100644
index 8d1ad37f17935331ee867c15f91842cdc53d4450..bec457e5aac17b0db0788110ceda778c81f26042 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -113,8 +113,10 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0055-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@ -17,7 +17,7 @@ index 1ae9910fefece1a3fe6410b27642da6edd8f296d..c872be77a6cd767520d5412b38ec4ed4
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b2ad6265a9e2bb16592fb9719339be83d92ff82b..92590d92c6eb5e0d56d7c1791782c2a7d03edb66 100644
index bec457e5aac17b0db0788110ceda778c81f26042..d6a95f47c42538b574ec55c0cfffe064b80fdef0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -279,6 +279,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@ -18,7 +18,7 @@ index 8026a55d462a646d6b39db21d52ba0871dfbc4d3..2acbe7437df71fc27580deddee8eb765
if (b0 > 0 && !this.z()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 92590d92c6eb5e0d56d7c1791782c2a7d03edb66..326be3a0ea64c328a6e8aafc752111f71e149381 100644
index d6a95f47c42538b574ec55c0cfffe064b80fdef0..4a0bbc0cd41b4a50ebad9b4569e07d727fc3e482 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -114,9 +114,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
View File

@ -47,7 +47,7 @@ index f53525eb32a6096ae24fd23756b2169d5d39e9d4..7b175240e44b0c7eb5044d7bcaf54dac
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 326be3a0ea64c328a6e8aafc752111f71e149381..f56710d84ab8519519edbcf1040aea912f9f4f3c 100644
index 4a0bbc0cd41b4a50ebad9b4569e07d727fc3e482..236b4f51ea805c671b905c1b081538b67cee7f57 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -191,8 +191,10 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
View File

@ -18,7 +18,7 @@ index 3936741bb8c1b3ad766d651e4bb8c9f5ddbe4f08..ac6460d261014bb4b9878c96e4b447f7
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f56710d84ab8519519edbcf1040aea912f9f4f3c..9878953c76a9bcd2a29774a37c1b65ec919b3963 100644
index 236b4f51ea805c671b905c1b081538b67cee7f57..2fae60a6fd767cc6d0aed7a6241ba5a6bf05eaca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -113,10 +113,12 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0060-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
View File

@ -18,7 +18,7 @@ index 54a555509e3d83e9749609dc35897ad151bca681..0ff202c0d77681f7e0d55d57c69dd0e4
} else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9878953c76a9bcd2a29774a37c1b65ec919b3963..744e1406e7a47045eff7a20b03a8eaf7128d768e 100644
index 2fae60a6fd767cc6d0aed7a6241ba5a6bf05eaca..edcbec38dfb5b32f4b8ba40c7a1ac6e26f0a4c3b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -285,9 +285,11 @@ public class PurpurWorldConfig {

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

@ -48,7 +48,7 @@ index f1a509063c09e603140c74255a3fb901693d2cc5..74c2d89af516ffc252032d5cbd12b489
this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 744e1406e7a47045eff7a20b03a8eaf7128d768e..a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48 100644
index edcbec38dfb5b32f4b8ba40c7a1ac6e26f0a4c3b..a1f85ef007f2ed410f1662405b0b1175c544e0b6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -286,10 +286,17 @@ public class PurpurWorldConfig {

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

@ -51,7 +51,7 @@ index 74c2d89af516ffc252032d5cbd12b489ea46813e..96dda6a14fd17509e9bcb72cc7e9c853
@Override
public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48..6954d4ac923cda1e0a0ead13c33dbc67ef6203b7 100644
index a1f85ef007f2ed410f1662405b0b1175c544e0b6..a9e7ddd55aa2b9b2c8f172069353b070c427b806 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -285,17 +285,21 @@ public class PurpurWorldConfig {

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

@ -18,7 +18,7 @@ index e4aedb3df5d0a47b5bb9175627aa794fc1779639..c06425434c97645b914c07940528901a
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6954d4ac923cda1e0a0ead13c33dbc67ef6203b7..93054e3bd9a9140dd86f2cfeb9d151251e816868 100644
index a9e7ddd55aa2b9b2c8f172069353b070c427b806..0de099d29b5e351822e59af6e389dc91c67eb2b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,12 +288,16 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0064-Implement-infinite-lava.patch
View File

@ -59,7 +59,7 @@ index 29930e801cdcb97bec2fb113ec478fe9c4a63b63..ffab2391925f577420ee52f3aa05041a
protected boolean f() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 93054e3bd9a9140dd86f2cfeb9d151251e816868..fc480a8df65768e980bd5ae5f2085d792e5f735b 100644
index 0de099d29b5e351822e59af6e389dc91c67eb2b2..37bc3033b3b7281da4f8783d3fbe9a0a4d33a9de 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -158,6 +158,13 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0065-Make-lava-flow-speed-configurable.patch
View File

@ -18,7 +18,7 @@ index ffab2391925f577420ee52f3aa05041afa61464e..d981aa5a5f001333675eabd50497bbfa
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc480a8df65768e980bd5ae5f2085d792e5f735b..0511516646c24eaa5dc2edbb24ef1b92a51dd906 100644
index 37bc3033b3b7281da4f8783d3fbe9a0a4d33a9de..d5adf653c6a561fe1de9e340d85c9439f8c559f5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -160,9 +160,13 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0066-Add-player-death-exp-control-options.patch
View File

@ -40,7 +40,7 @@ index e0cf2af8fcbfc66fc32aa8e693b62160b24f8672..093df82d49bfa6c34f081a719b5212ec
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0511516646c24eaa5dc2edbb24ef1b92a51dd906..4d6618db81b0306d37b1de01564bd6e7eabd4291 100644
index d5adf653c6a561fe1de9e340d85c9439f8c559f5..c5574ac52d050cc1b89ab2dbd4dad5ce5e331f83 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -123,6 +123,13 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0068-Configurable-void-damage-height.patch
View File

@ -18,7 +18,7 @@ index dfbb5a9538780cbd2a5766486138f35b189da235..9eb2e73c084b142bf04f798b572e6ca8
&& this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
this.doVoidDamage();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d6618db81b0306d37b1de01564bd6e7eabd4291..e150753b7635476ca3c0c0d0806db8121f6e6cd3 100644
index c5574ac52d050cc1b89ab2dbd4dad5ce5e331f83..4d34957c6255af571e593e015fa9dcafa733aceb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,11 +116,13 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0069-Dispenser-curse-of-binding-protection.patch
View File

@ -44,7 +44,7 @@ index 669a5041184846ca8430a7f0d3197025fe6d437e..7cd2e871b5a429a86dbc3c4208d247a4
return this.b;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e150753b7635476ca3c0c0d0806db8121f6e6cd3..e10a34e1d81e814921b853b8b4252b13e0d05aab 100644
index 4d34957c6255af571e593e015fa9dcafa733aceb..26df95f502d117398c7c9c65b298b97b62021700 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -162,6 +162,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0070-Add-option-for-boats-to-eject-players-on-land.patch
View File

@ -17,7 +17,7 @@ index baa4a61114e7460c74027e1519332f0dd9582647..603910a6f9ecc34be9eb2d4fb28e5c2e
} else {
return EntityBoat.EnumStatus.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e10a34e1d81e814921b853b8b4252b13e0d05aab..ed277e64f7228e1cd4a9697fd775715f761a3e13 100644
index 26df95f502d117398c7c9c65b298b97b62021700..5eae6c99e35d53f5340bc81034823a2f1ed85544 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,12 +112,14 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0072-Mending-mends-most-damages-equipment-first.patch
View File

@ -78,7 +78,7 @@ index 7f3df9ba37076c0a982803148d21b0985f62f12c..e747ee83f1a69a4a4bad87e720abc9b0
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ed277e64f7228e1cd4a9697fd775715f761a3e13..f5980d21cc10b3a43ae3ed2be961449810790e75 100644
index 5eae6c99e35d53f5340bc81034823a2f1ed85544..66e74ee74b56e25ca46704ca6cec403f15126c33 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0074-Implement-elytra-settings.patch
View File

@ -93,7 +93,7 @@ index 4eeeecef51cedcd0fe46ac4983472e214ccc9dad..0109d8db4f154802daef570e6d8b479c
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 f5980d21cc10b3a43ae3ed2be961449810790e75..c5193b394319fa68bedc6aa07b57fea24ac49d80 100644
index 66e74ee74b56e25ca46704ca6cec403f15126c33..ef977c50ab987f0762e1f9efd8ac6f559c38aaef 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/Purpur/patches/server/0075-Item-entity-immunities.patch
View File

@ -94,7 +94,7 @@ index 81a82a1fa811956a8b5233677981c2d3783b34fb..a9d60e5dc2f3b38a192a68d79bcf78e4
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 c5193b394319fa68bedc6aa07b57fea24ac49d80..9940bf351c05606137837ab2400ffe1a02b9bec2 100644
index ef977c50ab987f0762e1f9efd8ac6f559c38aaef..1e38e2e87ad30a908d9cf8d1455bb9250e281e55 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,39 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0077-Configurable-jockey-options.patch
View File

@ -193,7 +193,7 @@ 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 9940bf351c05606137837ab2400ffe1a02b9bec2..81a96503a6243800f4c37dc32f9550e3ee817fbb 100644
index 1e38e2e87ad30a908d9cf8d1455bb9250e281e55..dd6a86d5765008f98e59b54a365d824e390fdf94 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -275,6 +275,15 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@ -321,7 +321,7 @@ 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 81a96503a6243800f4c37dc32f9550e3ee817fbb..39f6b309342b91ab3bd4eed4afbeb8ccb1387e64 100644
index dd6a86d5765008f98e59b54a365d824e390fdf94..88cac6394f67ec113a781a552261f760fc95eb16 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -349,6 +349,15 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0079-Add-phantom-spawning-options.patch
View File

@ -245,7 +245,7 @@ index 226b5cd399449ca3587964221765e4d241dfc739..0f259913ddcf151bc0128f2591e1223a
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 39f6b309342b91ab3bd4eed4afbeb8ccb1387e64..966784d5398929497f4a426280bba47bb7caf9a7 100644
index 88cac6394f67ec113a781a552261f760fc95eb16..fedc39bdbbd328296c5c08d220d6695fe08fdf91 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -352,10 +352,34 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0080-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 966784d5398929497f4a426280bba47bb7caf9a7..ea20ca8dc50ff1216ce8ca351ef991d5808bd88c 100644
index fedc39bdbbd328296c5c08d220d6695fe08fdf91..35e4f4160358b12b61d2763b8d2f5ff51022b666 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;

2
patches/Purpur/patches/server/0081-Implement-respawn-anchor-explosion-options.patch
View File

@ -30,7 +30,7 @@ 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 ea20ca8dc50ff1216ce8ca351ef991d5808bd88c..8aaa718a0df3f71f9a06bf8eb3547453b26551da 100644
index 35e4f4160358b12b61d2763b8d2f5ff51022b666..07e60861c99db1ee1ba7a01c7a666a83e644aa2a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -251,6 +251,22 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0084-Entity-lifespan.patch
View File

@ -104,7 +104,7 @@ index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640df
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 8aaa718a0df3f71f9a06bf8eb3547453b26551da..5a04f0e506293f76bc43540142ca3b26cf97c760 100644
index 07e60861c99db1ee1ba7a01c7a666a83e644aa2a..2e3fee6bc4f3af7ad07a0db5657ffb3238e77e96 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 {

2
patches/Purpur/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@ -48,7 +48,7 @@ index 6bc2ef56fb36fa86c4318ffe3cecd3e28c28d2c4..d4d1d03990a3ad25eebaba4f0beec857
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5a04f0e506293f76bc43540142ca3b26cf97c760..0b2a9a2d9f157dd9879c4429be6745859b4f28bf 100644
index 2e3fee6bc4f3af7ad07a0db5657ffb3238e77e96..5d35651f43de81c8cf047479ad9c88c4b3f1c38c 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 {

2
patches/Purpur/patches/server/0086-Squid-EAR-immunity.patch
View File

@ -5,7 +5,7 @@ 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 0b2a9a2d9f157dd9879c4429be6745859b4f28bf..01576ac82836733f42168c6a0779b45ae63aeebb 100644
index 5d35651f43de81c8cf047479ad9c88c4b3f1c38c..32bb2524641722d16b6bafcc6b1af2793c1d9a45 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -453,6 +453,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0089-Phantoms-burn-in-light.patch
View File

@ -70,7 +70,7 @@ 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 01576ac82836733f42168c6a0779b45ae63aeebb..a4e5462d4731aaa4b0c436cf001d9c2be1cc961c 100644
index 32bb2524641722d16b6bafcc6b1af2793c1d9a45..fd7eabb033d8900bfab28c3d4a06626f7c0c3ef3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,6 +408,9 @@ public class PurpurWorldConfig {

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

@ -18,7 +18,7 @@ index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f195916
private boolean fr() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a4e5462d4731aaa4b0c436cf001d9c2be1cc961c..76ed53f930f6d2e01a854d0e28db4bcf11a06627 100644
index fd7eabb033d8900bfab28c3d4a06626f7c0c3ef3..a47962e2cc277a5c86b9cb5ab793e84286bd9af1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -471,6 +471,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0091-Redstone-deactivates-spawners.patch
View File

@ -26,7 +26,7 @@ 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 76ed53f930f6d2e01a854d0e28db4bcf11a06627..1f83fae3935d8bdacd396697e36d3c80d4d93b42 100644
index a47962e2cc277a5c86b9cb5ab793e84286bd9af1..743d1fe2eab2157a1100d0ef13d65ce85b10dbaa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -284,6 +284,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0092-Totems-work-in-inventory.patch
View File

@ -29,7 +29,7 @@ index 67f33647cd66c32fcc6d91edd7f66684c0e6464f..a7a5917fc7c6bbdecab26884cac361bc
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 1f83fae3935d8bdacd396697e36d3c80d4d93b42..9c32d1d0d283ce8fb290623c8e40c2606d2fdd82 100644
index 743d1fe2eab2157a1100d0ef13d65ce85b10dbaa..40a248746ea53640697395a155c18215fd2bbe51 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -201,6 +201,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0096-Add-vindicator-johnny-spawn-chance.patch
View File

@ -22,7 +22,7 @@ index 4761ddfedeed54e79788a6f60f06a805efd60ab1..23b350f793539672b6990327ed52e9bb
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c32d1d0d283ce8fb290623c8e40c2606d2fdd82..a38cea444879becaa043f131b754f7d812375e6c 100644
index 40a248746ea53640697395a155c18215fd2bbe51..87c68707aaab2d0e49d4e9c17de94b28a4324799 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 {

2
patches/Purpur/patches/server/0098-Dispensers-place-anvils-option.patch
View File

@ -61,7 +61,7 @@ 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 a38cea444879becaa043f131b754f7d812375e6c..059c66a2d3f878cde8896c8f10f71bfecaea4685 100644
index 87c68707aaab2d0e49d4e9c17de94b28a4324799..ade194e572b37365cc2becc69081bac8ca34ca46 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -251,8 +251,10 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0099-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 059c66a2d3f878cde8896c8f10f71bfecaea4685..95d13aafc468532f66abd265657f463e361f2297 100644
index ade194e572b37365cc2becc69081bac8ca34ca46..227bdc2d24d4d6dbacbf5b93497d1a4b61290af0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -234,6 +234,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0100-Add-no-tick-block-list.patch
View File

@ -43,7 +43,7 @@ index 49ae8bd50810473d121e786a06a813b777909904..c92f3043f6993e569cf83ac69682b85e
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 95d13aafc468532f66abd265657f463e361f2297..84db039126ab866aa2be4b7b1c0efa7e17573a54 100644
index 227bdc2d24d4d6dbacbf5b93497d1a4b61290af0..5b344d7eb8e4c031deb660955f2d1914f3ce4800 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;

2
patches/Purpur/patches/server/0101-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@ -17,7 +17,7 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 84db039126ab866aa2be4b7b1c0efa7e17573a54..33aae151c8d79bac8fb52f2c3f526d0017306098 100644
index 5b344d7eb8e4c031deb660955f2d1914f3ce4800..07cc9766d420d5584c53692e37abaca5b5ac95f5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -353,6 +353,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0103-Stop-squids-floating-on-top-of-water.patch
View File

@ -43,7 +43,7 @@ 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 33aae151c8d79bac8fb52f2c3f526d0017306098..94f11a3dc2a4e595e3fe9dffee3d31de0040292f 100644
index 07cc9766d420d5584c53692e37abaca5b5ac95f5..637cac2758a44e72794953b9fbca2accb7d86b6a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -499,8 +499,10 @@ public class PurpurWorldConfig {

14
patches/Purpur/patches/server/0104-Ridables.patch
View File

@ -3889,10 +3889,10 @@ index 8a1ff579ddf2fef191bc370dc51dd2e6404d9a22..3c14ed27e5b487451846f6811f189e6f
}
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b908223808404966 100644
index 51396cbd18d0e053e788f82bf4a3bc2533f20e11..66a90507aaf16bb8512a77f3c9aa501697e49862 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -14,12 +14,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -13,12 +13,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
super(entitytypes, world);
}
@ -3919,7 +3919,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238
this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityInsentient.class, 10, true, false, (entityliving) -> {
return entityliving instanceof IMonster;
}));
@@ -71,6 +85,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -70,6 +84,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
return;
}
@ -3927,7 +3927,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238
IBlockData iblockdata = Blocks.SNOW.getBlockData();
for (int l = 0; l < 4; ++l) {
@@ -113,7 +128,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -112,7 +127,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
if (itemstack.getItem() == Items.SHEARS && this.canShear()) {
// CraftBukkit start
if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
@ -3936,7 +3936,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238
}
// CraftBukkit end
this.shear(SoundCategory.PLAYERS);
@@ -141,7 +156,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -132,7 +147,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
return EnumInteractionResult.SUCCESS;
// Purpur end
} else {
@ -5071,7 +5071,7 @@ index c314a8c9a921a95cea43b748e2037521d948e1e7..59f3122aab9940cb3c3c1efb2664ab08
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 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d43e9b6e80 100644
index 637cac2758a44e72794953b9fbca2accb7d86b6a..3d3505f538510fbef4a7d584fa5f03c48be184f7 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 {
@ -5535,7 +5535,7 @@ index 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d4
+ public boolean snowGolemRidable = false;
+ public boolean snowGolemRidableInWater = false;
+ public boolean snowGolemLeaveTrailWhenRidden = false;
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
private void snowGolemSettings() {
+ snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);

2
patches/Purpur/patches/server/0107-Entities-can-use-portals-configuration.patch
View File

@ -27,7 +27,7 @@ index 0115e2c73eff9d5e4c6778e32fc54b9c116b6b22..e4f2e51b6306fcaf161b7dfb734d9d28
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 a70f8d6bd20bebb128ef0c232384f7d43e9b6e80..3ce06799d0c5798f094171b3c559b7eec65b66a3 100644
index 3d3505f538510fbef4a7d584fa5f03c48be184f7..d0d220ece6596bbefcb428ffc94aff566ad6ef19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -158,6 +158,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0109-Customizable-wither-health-and-healing.patch
View File

@ -44,7 +44,7 @@ index 59382230aec623f7de889c30a0ed6a2a3fa35a05..121eefd5d89f88c762b19088c657a41f
//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 3ce06799d0c5798f094171b3c559b7eec65b66a3..789d471ae244f635fc393d0bf581189587a7ee57 100644
index d0d220ece6596bbefcb428ffc94aff566ad6ef19..9ca3615cc66f4bca038f63add1dfb739d8b0a4c0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -919,10 +919,21 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0110-Allow-toggling-special-MobSpawners-per-world.patch
View File

@ -72,7 +72,7 @@ index 5a6aace070e64b6db315d766d16773c408de638e..ded19d1773237eaf51f72ce93a6794db
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 789d471ae244f635fc393d0bf581189587a7ee57..c38f262a8151397be319f083ee6c201ccaf1a9ec 100644
index 9ca3615cc66f4bca038f63add1dfb739d8b0a4c0..7843d6ed07ae928eb450b6604cf58900a71fc958 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/Purpur/patches/server/0111-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 c38f262a8151397be319f083ee6c201ccaf1a9ec..d7a4bf3ecb012adddbb9be2b42e9815c739659c7 100644
index 7843d6ed07ae928eb450b6604cf58900a71fc958..9461f12a4c4e863f9e7e2d7fc0848f328f580339 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -173,6 +173,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0112-Despawn-rate-config-options-per-projectile-type.patch
View File

@ -300,7 +300,7 @@ index b7e540dfeeabb13227596ecfc6eddabf3cfde537..56adefabdfbf444e87129715f107c6d3
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 d7a4bf3ecb012adddbb9be2b42e9815c739659c7..fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0 100644
index 9461f12a4c4e863f9e7e2d7fc0848f328f580339..5da0cd476fd2d99bede6c4f897c93144cfeb7579 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -165,6 +165,35 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0114-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@ -69,7 +69,7 @@ index 7e1e056bdd966a14a184eb76717116998b6e5cb3..fd28ef623f8b6db5e36328d4ef2771e8
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 fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0..3d4e99bdab36ae51eb001ba40c30e56478b9eefd 100644
index 5da0cd476fd2d99bede6c4f897c93144cfeb7579..6eb30ec9f9e25cb0d9a18cee49fb8ed6a3b00f95 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1021,12 +1021,14 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0115-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 3d4e99bdab36ae51eb001ba40c30e56478b9eefd..643dfd2f50939708fa6f3127ca371674f69f6527 100644
index 6eb30ec9f9e25cb0d9a18cee49fb8ed6a3b00f95..203913c91d1c12a233a9c0af8b812752457b99e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -200,6 +200,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0117-Flying-squids-Oh-my.patch
View File

@ -38,7 +38,7 @@ 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 643dfd2f50939708fa6f3127ca371674f69f6527..06c23ba2eefd1ed6b0deddd3aee3604fae58f493 100644
index 203913c91d1c12a233a9c0af8b812752457b99e4..1ea4a9b5c710a188f8321406737400a3caeb3c94 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -877,10 +877,12 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0118-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 06c23ba2eefd1ed6b0deddd3aee3604fae58f493..52d172109df33fc96ddf00b340997f61a6f247ef 100644
index 1ea4a9b5c710a188f8321406737400a3caeb3c94..65b9b55e9cfaa4d741a09249c54b9d64cab3e910 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -165,6 +165,15 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0119-Stonecutter-damage.patch
View File

@ -39,7 +39,7 @@ index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926df
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 52d172109df33fc96ddf00b340997f61a6f247ef..0ed9e5998d00365da1cca37c9980ff0c97b1549a 100644
index 65b9b55e9cfaa4d741a09249c54b9d64cab3e910..a1c4a408abb729e2fa6e08aa57bcaaf2a2a2d065 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -383,6 +383,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0120-Configurable-daylight-cycle.patch
View File

@ -74,7 +74,7 @@ index ded19d1773237eaf51f72ce93a6794db8f56d160..cb2c429bda81b8c151a50ef3627716fe
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 0ed9e5998d00365da1cca37c9980ff0c97b1549a..4143e6d4900e1a774804e2ef69a820274cd36af1 100644
index a1c4a408abb729e2fa6e08aa57bcaaf2a2a2d065..ef09664ad1521b17b99fa99f5a560167e4ca19b2 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 {

2
patches/Purpur/patches/server/0122-Infinite-fuel-furnace.patch
View File

@ -41,7 +41,7 @@ index e75e676d196d9f5a3409ec50645fab611b0afdad..76ea1d003b43d822e2b85eec3b874015
if (flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4143e6d4900e1a774804e2ef69a820274cd36af1..ac6db65af48222bb3d5c2234e42eb57ef2c1588d 100644
index ef09664ad1521b17b99fa99f5a560167e4ca19b2..8bd8a84bd14fff380662d19c1cbe6997a65fb33a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -351,6 +351,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0125-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@ -24,7 +24,7 @@ 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 ac6db65af48222bb3d5c2234e42eb57ef2c1588d..1db3c53b64a8cdd487e8672befa72fdda8eb30e5 100644
index 8bd8a84bd14fff380662d19c1cbe6997a65fb33a..f8d7cefc1f231bfe6f09ff6bc01f00a7e3a90553 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -347,8 +347,10 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0126-Add-adjustable-breeding-cooldown-to-config.patch
View File

@ -94,7 +94,7 @@ index ded92fe7c7871bae6e9741747a67636d570cdeef..7c367fe6152c30aab3e53c8f88cceba6
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 1db3c53b64a8cdd487e8672befa72fdda8eb30e5..bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996 100644
index f8d7cefc1f231bfe6f09ff6bc01f00a7e3a90553..a70bd4fdb0634110bc2b68780c28d4a2b788e1e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -220,6 +220,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0127-Make-animal-breeding-times-configurable.patch
View File

@ -398,7 +398,7 @@ 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 bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996..280cc66097fc2161a5905ae3e308b0571172afe0 100644
index a70bd4fdb0634110bc2b68780c28d4a2b788e1e6..9947b5ad48ff24f79f900aa59ae39364db44576b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -434,10 +434,12 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0128-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@ -188,7 +188,7 @@ index a4edfb02fd350433020b0f3699726b6127ab9933..3f9062d8eca3ce53c0fb9e9e40330aa4
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 280cc66097fc2161a5905ae3e308b0571172afe0..14440adbca4d589e172e67b669d4d5799286d085 100644
index 9947b5ad48ff24f79f900aa59ae39364db44576b..e7817f9dfdf809a5d6d15cf28aedcc9ed1c7ca72 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/Purpur/patches/server/0129-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 14440adbca4d589e172e67b669d4d5799286d085..3d3d718bff710f0ea9e699e2acc82c4c68e65f3d 100644
index e7817f9dfdf809a5d6d15cf28aedcc9ed1c7ca72..d9f385d97887110558747ef16a13e42a0115e5bd 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 {

2
patches/Purpur/patches/server/0130-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@ -67,7 +67,7 @@ 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 3d3d718bff710f0ea9e699e2acc82c4c68e65f3d..bc09361580b85c3eff533c6dd245e8fc219f2a5f 100644
index d9f385d97887110558747ef16a13e42a0115e5bd..eb04a84ecd69c8c64857d509c4629f599055c6e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -419,6 +419,16 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0131-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@ -89,7 +89,7 @@ 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 bc09361580b85c3eff533c6dd245e8fc219f2a5f..1f00fc0aede9841316830bc350ec9a4db0881764 100644
index eb04a84ecd69c8c64857d509c4629f599055c6e6..95fd7fddba102965b1948214c9ceeee3e9ba41f8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -366,6 +366,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0132-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@ -21,7 +21,7 @@ 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 1f00fc0aede9841316830bc350ec9a4db0881764..858363deaad76ea1837f90394a1009db6a42a166 100644
index 95fd7fddba102965b1948214c9ceeee3e9ba41f8..95202b48e08971bb096f01899a8a250e794777fe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -588,10 +588,12 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0134-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 858363deaad76ea1837f90394a1009db6a42a166..f4abaeaa36f97c8cae0507c7746cd960a5fc35fc 100644
index 95202b48e08971bb096f01899a8a250e794777fe..ad799b1abc425b78ae2435001ec591660b3965b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -214,6 +214,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0135-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 f4abaeaa36f97c8cae0507c7746cd960a5fc35fc..afe772f6249f3901a5057684fcce89053237bc13 100644
index ad799b1abc425b78ae2435001ec591660b3965b2..53f0fbb036d45749190d078282d0e92e87b83269 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;

2
patches/Purpur/patches/server/0139-Changeable-Mob-Left-Handed-Chance.patch
View File

@ -18,7 +18,7 @@ index 91e5741876e97e85a93d9ffe62164176f99f6808..03f480e29b92e278e1d4901ee4388f02
} 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 afe772f6249f3901a5057684fcce89053237bc13..39d8752a673f10cd95a28e091ab8d5d7f626ebbd 100644
index 53f0fbb036d45749190d078282d0e92e87b83269..d58cba46018b4ce96eb3d88450eed098825c03b1 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 {

2
patches/Purpur/patches/server/0140-Add-boat-fall-damage-config.patch
View File

@ -27,7 +27,7 @@ index 871119dc506ff3bcd96f57fb5f5923227e0c7f1f..63b919bef1a4420e02b4822097cadc1a
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 39d8752a673f10cd95a28e091ab8d5d7f626ebbd..904a49a96a6b410046846ec48a3d1817d1d6879d 100644
index d58cba46018b4ce96eb3d88450eed098825c03b1..e6dc9c07ecf26c68510ed1aed7888d2192e6d54b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -224,6 +224,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0141-Config-migration-disable-saving-projectiles-to-disk-.patch
View File

@ -36,7 +36,7 @@ index 9294bfab12ef88690e359ff90551c5c615cdd3dd..e928716d7a2dcb390507b746763e6f7e
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 904a49a96a6b410046846ec48a3d1817d1d6879d..22a930a42e10447216c6c60bab5772f1c7c2fed1 100644
index e6dc9c07ecf26c68510ed1aed7888d2192e6d54b..2b406c22f7d481fb9e62f8b1b7e317edf7543a84 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,6 @@

8
patches/Purpur/patches/server/0142-Snow-Golem-rate-of-fire-config.patch
View File

@ -10,10 +10,10 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
0, snow golems won't shoot any snowballs.
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b4f89939a 100644
index 66a90507aaf16bb8512a77f3c9aa501697e49862..4c083bcfe7d083713b418486f0918f39b96bdb65 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -29,7 +29,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -28,7 +28,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@Override
protected void initPathfinder() {
this.goalSelector.a(0, new PathfinderGoalHasRider(this)); // Purpur
@ -23,12 +23,12 @@ 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 22a930a42e10447216c6c60bab5772f1c7c2fed1..6794e9f57ec599128c9b65f2940f71f230f2715a 100644
index 2b406c22f7d481fb9e62f8b1b7e317edf7543a84..9922410c8d11acca6ba774bca40804091b95d12e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -979,12 +979,20 @@ public class PurpurWorldConfig {
public boolean snowGolemLeaveTrailWhenRidden = false;
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
+ public int snowGolemSnowBallMin = 20;
+ public int snowGolemSnowBallMax = 20;

2
patches/Purpur/patches/server/0145-Config-migration-climbing-should-not-bypass-cramming.patch
View File

@ -28,7 +28,7 @@ index bce8781a2a1d856429d00b8cd9c9ac03425e1bbb..83c1176888ead8fe045f1e1dfc78115a
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 6794e9f57ec599128c9b65f2940f71f230f2715a..3bcf4a471ed4eb049e5facb3bfb22f133d0444a3 100644
index 9922410c8d11acca6ba774bca40804091b95d12e..4b5c42d78f8e62fd2260778b3170d3eb2ebaea83 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 {

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

@ -88,7 +88,7 @@ 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 3bcf4a471ed4eb049e5facb3bfb22f133d0444a3..7bc193aae13003a2094b937c2899c55dfb9a5107 100644
index 4b5c42d78f8e62fd2260778b3170d3eb2ebaea83..46859afbf3c2cbc5718e240f7965288549e915a9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1073,6 +1073,8 @@ public class PurpurWorldConfig {

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

@ -234,7 +234,7 @@ index 3c60da7ac6faebe9d964e893974e42613c59b4c1..6493f220a0cf627e82e5f3f3c85e9934
public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7bc193aae13003a2094b937c2899c55dfb9a5107..110690251fc3e76f7f16f5614e1dca3c0754ebb8 100644
index 46859afbf3c2cbc5718e240f7965288549e915a9..b8dcb9c48ed8cac881b4bb1b4d995966d15f44eb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1075,6 +1075,8 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0148-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@ -35,7 +35,7 @@ index 3327dbbf87d8f43cbc7cd728df2f4c6a33dae40d..57f3358b8dfd53f5b1d2e976d64b809f
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 110690251fc3e76f7f16f5614e1dca3c0754ebb8..3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a 100644
index b8dcb9c48ed8cac881b4bb1b4d995966d15f44eb..7ec9a135778c685344d22ddba02c0858872c50fa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1206,12 +1206,14 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0150-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@ -201,7 +201,7 @@ index 9a4819815c7a4bf2fd4a92c4169ace35f2261704..da29898574d30d5fecc5a44ad7b36556
public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class<T> oclass, Predicate<EntityLiving> predicate, float f, double d0, double d1, Predicate<EntityLiving> predicate1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a..533e9aedc69645e6c2d16dbf2abb767b9826feb6 100644
index 7ec9a135778c685344d22ddba02c0858872c50fa..7fb9ceba6cb35fb0a2ae782abc1ebc1f56c0d55a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1157,10 +1157,14 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0151-Configurable-default-wolf-collar-color.patch
View File

@ -24,7 +24,7 @@ index 5fe2e9f4bfbdc08690eacd6196e59529dc7953e8..fd62dc51258876275adbe02f750fd881
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 533e9aedc69645e6c2d16dbf2abb767b9826feb6..2d177f9583798d56fae2d08ad2b4805a91585698 100644
index 7fb9ceba6cb35fb0a2ae782abc1ebc1f56c0d55a..878c5f324484bbd401ea177fda6b1b5e53aaf778 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -3,6 +3,7 @@ package net.pl3x.purpur;

6
patches/Purpur/patches/server/0152-Configurable-entity-base-attributes.patch
View File

@ -1037,10 +1037,10 @@ index 3c14ed27e5b487451846f6811f189e6fba05d32d..36b384fd8fc29b270bb8c0ccc66ffad1
this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue((double) i);
if (flag) {
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index e5b3d298f52006f39a36cfdd95097e7b4f89939a..319bb68f27f360bb36897c73a68ddeac64b67a6f 100644
index 4c083bcfe7d083713b418486f0918f39b96bdb65..fa0c459dcd773e003a2852c594ec7254e4eb11b8 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -24,6 +24,11 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -23,6 +23,11 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
public boolean isRidableInWater() {
return world.purpurConfig.snowGolemRidableInWater;
}
@ -1314,7 +1314,7 @@ index 0c47477b416980d2e932321730525bf5a8feda4f..dc850677c29c16805f28af00b2a63363
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2d177f9583798d56fae2d08ad2b4805a91585698..555121ff9f3b6b666a5e1396d04870d6d725df75 100644
index 878c5f324484bbd401ea177fda6b1b5e53aaf778..a9953a72055d23354b72f9800625a745c7d4eada 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -484,30 +484,58 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0153-Phantom-flames-on-swoop.patch
View File

@ -17,7 +17,7 @@ index 25345d8d585735af407787f2c26fe92674721239..087a91fedc49aaf6e74b81b90494849c
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 555121ff9f3b6b666a5e1396d04870d6d725df75..e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9 100644
index a9953a72055d23354b72f9800625a745c7d4eada..c96d20c5a4b2885cc0f1417de961a381ef44f7d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1147,6 +1147,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0154-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@ -17,7 +17,7 @@ index c4ff93a6b908c1bd157c7fe45b504909b189d09c..71a32a317e38b9c8f802fd5dd9ae546f
return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9..9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd 100644
index c96d20c5a4b2885cc0f1417de961a381ef44f7d2..fbcf02831d1ca663c85988a53f8593c7e999178d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -381,6 +381,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0156-Striders-give-saddle-back.patch
View File

@ -28,7 +28,7 @@ index 1bca386b7dea01af88a6c8d8e87ff11a0b21cc7a..964956a0027bf0941ff75d658be760b7
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd..8aa4a08f4b8af273ea2f3e32066faec597e36015 100644
index fbcf02831d1ca663c85988a53f8593c7e999178d..c3085b3c82f39b9b3343c36c0659e21ee4e8f70c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1500,11 +1500,13 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0158-Full-netherite-armor-grants-fire-resistance.patch
View File

@ -26,7 +26,7 @@ index b6bfd8f5073ce481dfe2b1667ece42d32eaeb227..81f7d5bc581b42289a79121da1586899
protected ItemCooldown i() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8aa4a08f4b8af273ea2f3e32066faec597e36015..abea37ca263b718f08ad3dd1f931acfb366962b8 100644
index c3085b3c82f39b9b3343c36c0659e21ee4e8f70c..5c82f785e0dd5c0015d2e46ba1b93b784d91030a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -310,6 +310,19 @@ public class PurpurWorldConfig {

8
patches/Purpur/patches/server/0160-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@ -233,10 +233,10 @@ index 4ed7a20bfed267776628457a4b33178bac7d1972..e7e12ce2338102b875444c3f3cc76785
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 319bb68f27f360bb36897c73a68ddeac64b67a6f..550decf12140596e63b57a7ee5940e4f7b7dbc0b 100644
index fa0c459dcd773e003a2852c594ec7254e4eb11b8..88eeabeb89fe733c462a667d7564da3b125952a2 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -86,7 +86,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -85,7 +85,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
this.damageEntity(CraftEventFactory.MELTING, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
}
@ -338,7 +338,7 @@ index c03ebbc933197be3e7097ea3f7b7cd08c90db7bb..37c1d1ac1bfcaf84d00135ad3c9d9e9b
} else if (this.c > 0) {
--this.c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e78fea2726 100644
index 5c82f785e0dd5c0015d2e46ba1b93b784d91030a..c156f89e74e7db776fdfcfb2f7b30b4326fc0506 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -252,6 +252,7 @@ public class PurpurWorldConfig {
@ -514,7 +514,7 @@ index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e7
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
+ public boolean snowGolemBypassMobGriefing = false;
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
public int snowGolemSnowBallMin = 20;
@@ -1450,6 +1475,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0161-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@ -22,7 +22,7 @@ index df69d00d3a38417e53f433cd1eb1f6cf3ec9b55b..6bb6e229c8734d7b9f4e3cd3dd1b4b64
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.get(BlockNote.INSTRUMENT), data.get(BlockNote.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6a63ea0dbc48c69ebb12bb19e2e832e78fea2726..4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3 100644
index c156f89e74e7db776fdfcfb2f7b30b4326fc0506..5b69a3c3aa7fc830e3471ef7b99c8c4d38178127 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -254,6 +254,7 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0162-Add-EntityTeleportHinderedEvent.patch
View File

@ -94,7 +94,7 @@ index ed8e91bf6c8b9d410d439bdddd5067d346a20a7e..127b5d8215f2bb4c5c523c5a77ebccfb
if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds
this.a((WorldServer) this.world);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3..4d1851d23f27f58299f72f4bc14e7c99c69245d2 100644
index 5b69a3c3aa7fc830e3471ef7b99c8c4d38178127..14e80ed8cb3c0cacef8c7a5d44cda9805249ed03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1877,4 +1877,9 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0164-Farmland-trampling-changes.patch
View File

@ -28,7 +28,7 @@ index 73dc0f499c456c21d298013fbab8c79ebcdecd6b..6b65a4b1845c6770f92ceebd04827595
if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) {
return;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d1851d23f27f58299f72f4bc14e7c99c69245d2..5699d54d9ffd1f194a22fe03ad4d144d3ad5a007 100644
index 14e80ed8cb3c0cacef8c7a5d44cda9805249ed03..8ce8f9eaf9b41003bbfa3acc4f7cbd8329d1b9b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,10 +413,14 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0165-Movement-options-for-armour-stands.patch
View File

@ -66,7 +66,7 @@ index 759a8f95038778aead2f33a65a2d8f2d6b26a765..74fda434ed7beb6612f46ed75fdccad5
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5699d54d9ffd1f194a22fe03ad4d144d3ad5a007..403c1a4db53ea9919d14910a7dd3db9e37040507 100644
index 8ce8f9eaf9b41003bbfa3acc4f7cbd8329d1b9b2..87f1af12abe92d10dcab532715d10c39f95119b7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,10 +111,16 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0166-Fix-stuck-in-portals.patch
View File

@ -37,7 +37,7 @@ index 63b919bef1a4420e02b4822097cadc1af9cd97a2..9013e8655d6e09f830adda8001567ab8
// CraftBukkit end
this.spawnIn(worldserver);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 403c1a4db53ea9919d14910a7dd3db9e37040507..1789c55df554335bacafba0b07bf10db09909693 100644
index 87f1af12abe92d10dcab532715d10c39f95119b7..ed9703608467aa99f5cef6a6154fdf05efdbe0f7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -350,6 +350,11 @@ public class PurpurWorldConfig {

2
patches/Purpur/patches/server/0168-Config-to-use-infinity-bows-without-arrows.patch
View File

@ -20,7 +20,7 @@ index 8241f3dafa5852bed7a3967e7260b36f47198dba..edfb09fe673a9a7fe4e0410c0c0eeeda
} else {
entityhuman.c(enumhand);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1789c55df554335bacafba0b07bf10db09909693..074ebb5ee808875b1a90b70e42ef440af002f5c6 100644
index ed9703608467aa99f5cef6a6154fdf05efdbe0f7..0747718f8705f5f56089e83e8344ad93b0055a15 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -209,10 +209,12 @@ public class PurpurWorldConfig {

6
patches/Purpur/patches/server/0169-Toggle-for-water-sensitive-mob-damage.patch
View File

@ -57,10 +57,10 @@ index 330f27f649a2ab1567ebc1b547f1f2a5ce645055..5f9d8999ae7a1d742918e58c0f1bb36f
return false;
}
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 550decf12140596e63b57a7ee5940e4f7b7dbc0b..286c956bc56ff2adc75b35ac8bfaaf985d9e3368 100644
index 88eeabeb89fe733c462a667d7564da3b125952a2..2c22447c361962d76e0e18986e5406eb635ab46f 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -71,7 +71,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@@ -70,7 +70,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt
@Override
public boolean dO() {
@ -83,7 +83,7 @@ index 964956a0027bf0941ff75d658be760b754772fa0..7c5472a5138011a3376b7b6ec2467bdf
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 074ebb5ee808875b1a90b70e42ef440af002f5c6..42e09d1a20de61b68fedd4ca56517e06aa18f173 100644
index 0747718f8705f5f56089e83e8344ad93b0055a15..ad6f5bf3a2f0734ffeba044025a52fd15e9970fb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -569,6 +569,7 @@ public class PurpurWorldConfig {

2
patches/server/0060-Port-hydrogen.patch
View File

@ -355,7 +355,7 @@ index 7b8036840dcca16904b3063c209d5ff10ab8a6af..6bc5fedc4d8effa530799eac814f626d
public org.bukkit.Chunk bukkitChunk;
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 5f04591193d58ba7897194142da5efcbec3763dd..bf4f34b5f4f7473921589b2f001570a38e96c5ce 100644
index e77da341b765725771726283d3a8249b514b40da..c44333ec5b0c1914f7cb9f4b3b39626069136c22 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -70,8 +70,10 @@ public class ChunkRegionLoader {

2
upstream/Airplane

@ -1 +1 @@
Subproject commit d7d1626f8e87461cf2e5d882b1ca53f828b1b132
Subproject commit a1d0b30d187239c51b51bb7cb5f0465c1a85aeaa

2
upstream/Purpur

@ -1 +1 @@
Subproject commit 7fc2d31be761c91ee3cbbde0e2832834063f5899
Subproject commit be941d8428321bc535121848f95d0236a1953271

2
upstreamCommits/Airplane
View File

@ -1 +1 @@
d7d1626f8e87461cf2e5d882b1ca53f828b1b132
a1d0b30d187239c51b51bb7cb5f0465c1a85aeaa

2
upstreamCommits/Purpur
View File

@ -1 +1 @@
7fc2d31be761c91ee3cbbde0e2832834063f5899
be941d8428321bc535121848f95d0236a1953271

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