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

Updated Upstream (Paper & Airplane)

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

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patches/server/0146-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7339ec31aba03974991fdb247beefc747fa003a5..10ed6cf0d1543e1fbfb54308aa785cc206abd13d 100644
index ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdda0e11a36 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
@@ -290,7 +290,7 @@ index e69213b43c8aa5a7c04add7a87482d531fbf52d2..f51ea103238b4a50439f5162a248cd9a
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 0079464e934f495f55a4e7edbe7031ec13e4d8d4..cf01bd0827d6f4012f22eef33782f651493be720 100644
index d5d6fde1e375e5cdfc7726edd4c9b202c4cb0171..62abfc9ed33312acee299afa447ef4e208bd9cd7 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -320,6 +320,6 @@ public abstract class Projectile extends Entity {
@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e51f4d4ec2 100644
index b6800b176e59bb9d5e108bcc4f3d8e00423c393d..282a98b682558818bc1b694b82592feb3bc5dad7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -381,9 +381,12 @@ public class PurpurWorldConfig {
@@ -458,7 +458,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -712,6 +730,7 @@ public class PurpurWorldConfig {
@@ -718,6 +736,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -723,6 +742,7 @@ public class PurpurWorldConfig {
@@ -729,6 +748,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean dolphinRidable = false;
@@ -810,6 +830,7 @@ public class PurpurWorldConfig {
@@ -816,6 +836,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -825,6 +846,7 @@ public class PurpurWorldConfig {
@@ -831,6 +852,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean endermanRidable = false;
@@ -832,6 +854,7 @@ public class PurpurWorldConfig {
@@ -838,6 +860,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -843,6 +866,7 @@ public class PurpurWorldConfig {
@@ -849,6 +872,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean endermiteRidable = false;
@@ -862,6 +886,7 @@ public class PurpurWorldConfig {
@@ -868,6 +892,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -871,6 +896,7 @@ public class PurpurWorldConfig {
@@ -877,6 +902,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean foxRidable = false;
@@ -878,6 +904,7 @@ public class PurpurWorldConfig {
@@ -884,6 +910,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -889,6 +916,7 @@ public class PurpurWorldConfig {
@@ -895,6 +922,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean ghastRidable = false;
@@ -1284,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1290,6 +1318,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1293,6 +1322,7 @@ public class PurpurWorldConfig {
@@ -1299,6 +1328,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean piglinBruteRidable = false;
@@ -1312,6 +1342,7 @@ public class PurpurWorldConfig {
@@ -1318,6 +1348,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1321,6 +1352,7 @@ public class PurpurWorldConfig {
@@ -1327,6 +1358,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean polarBearRidable = false;
@@ -1362,6 +1394,7 @@ public class PurpurWorldConfig {
@@ -1368,6 +1400,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1374,11 +1407,13 @@ public class PurpurWorldConfig {
@@ -1380,11 +1413,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1388,6 +1423,7 @@ public class PurpurWorldConfig {
@@ -1394,6 +1429,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean salmonRidable = false;
@@ -1406,6 +1442,7 @@ public class PurpurWorldConfig {
@@ -1412,6 +1448,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1416,6 +1453,7 @@ public class PurpurWorldConfig {
@@ -1422,6 +1459,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean shulkerRidable = false;
@@ -1435,6 +1473,7 @@ public class PurpurWorldConfig {
@@ -1441,6 +1479,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1444,6 +1483,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1489,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean skeletonRidable = false;
@@ -1511,6 +1551,7 @@ public class PurpurWorldConfig {
@@ -1517,6 +1557,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1527,6 +1568,7 @@ public class PurpurWorldConfig {
@@ -1533,6 +1574,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean squidRidable = false;
@@ -1686,6 +1728,7 @@ public class PurpurWorldConfig {
@@ -1692,6 +1734,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1712,6 +1755,7 @@ public class PurpurWorldConfig {
@@ -1718,6 +1761,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean vindicatorRidable = false;
@@ -1768,6 +1812,7 @@ public class PurpurWorldConfig {
@@ -1774,6 +1818,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1784,6 +1829,7 @@ public class PurpurWorldConfig {
@@ -1790,6 +1835,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
}
public boolean witherSkeletonRidable = false;
@@ -1849,6 +1895,7 @@ public class PurpurWorldConfig {
@@ -1855,6 +1901,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index a8390aad9b3991ae83102de0057a2ed45914c612..8df99d5ccee0ff4280a720b2373407e5
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1868,6 +1915,7 @@ public class PurpurWorldConfig {
@@ -1874,6 +1921,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}