mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Rebuild patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From ad3d48f144a189b9339a15e3a1d6073b9d9aeb9e Mon Sep 17 00:00:00 2001
|
||||
From 19ce8c3dfb27464eeb4a11406ee973e096bd0e9e Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 26 Apr 2020 16:28:38 -0500
|
||||
Subject: [PATCH] Add enderman and creeper griefing controls
|
||||
@@ -43,10 +43,10 @@ index de30ce483..68165d72d 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index d98cf3bd9..2a81fed03 100644
|
||||
index 0347b729c..e6ab2fde4 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -418,11 +418,13 @@ public class PurpurWorldConfig {
|
||||
@@ -394,11 +394,13 @@ public class PurpurWorldConfig {
|
||||
public boolean creeperRidableInWater = false;
|
||||
public boolean creeperRequireShiftToMount = true;
|
||||
public double creeperChargedChance = 0.0D;
|
||||
@@ -60,7 +60,7 @@ index d98cf3bd9..2a81fed03 100644
|
||||
}
|
||||
|
||||
public boolean dolphinRidable = false;
|
||||
@@ -487,10 +489,12 @@ public class PurpurWorldConfig {
|
||||
@@ -463,10 +465,12 @@ public class PurpurWorldConfig {
|
||||
public boolean endermanRidable = false;
|
||||
public boolean endermanRidableInWater = false;
|
||||
public boolean endermanRequireShiftToMount = true;
|
||||
@@ -1,4 +1,4 @@
|
||||
From b36111ba69cee74184c535937b1e5b0450d8de7c Mon Sep 17 00:00:00 2001
|
||||
From a3387f88acd84e5be42b387639edf010bb06c102 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 12 Apr 2020 13:19:34 -0500
|
||||
Subject: [PATCH] Chickens can retaliate
|
||||
@@ -47,7 +47,7 @@ index 5505b7ee9..1c9b0ce61 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 0347b729c..b557353ac 100644
|
||||
index e6ab2fde4..6962d17b9 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -361,6 +361,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From ff1db34db12d20251bb1301e66d937f12856b9f7 Mon Sep 17 00:00:00 2001
|
||||
From 7ca338c32001686b5395fe2f6d2deae6fe0f4bb1 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 24 Apr 2020 09:33:11 -0500
|
||||
Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
|
||||
@@ -22,10 +22,10 @@ index eb0befb35..4e5b71046 100644
|
||||
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 fa92f92b2..394c62f49 100644
|
||||
index 6962d17b9..e57299f1e 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -209,6 +209,7 @@ public class PurpurWorldConfig {
|
||||
@@ -200,6 +200,7 @@ public class PurpurWorldConfig {
|
||||
public double controllableMinecartsBaseSpeed = 0.1D;
|
||||
public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
@@ -33,7 +33,7 @@ index fa92f92b2..394c62f49 100644
|
||||
public boolean fixClimbingBypassingCrammingRule = false;
|
||||
public boolean itemFloatInLava = false;
|
||||
public List<Item> itemImmuneToExplosion = new ArrayList<>();
|
||||
@@ -244,6 +245,7 @@ public class PurpurWorldConfig {
|
||||
@@ -235,6 +236,7 @@ public class PurpurWorldConfig {
|
||||
set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D);
|
||||
}
|
||||
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
|
||||
@@ -1,4 +1,4 @@
|
||||
From fd938ddd4e59b2a4be5cecddf376911cc7e6656b Mon Sep 17 00:00:00 2001
|
||||
From f4c550232866ac0383d7d372af38a29c87928cf2 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 19 Apr 2020 00:17:56 -0500
|
||||
Subject: [PATCH] More anvil controls
|
||||
@@ -1,4 +1,4 @@
|
||||
From df9c90766759ccbc38522a5cba84ce36d99ec377 Mon Sep 17 00:00:00 2001
|
||||
From 5ed79fd249b8fb416a89aae7162fee15109e15d1 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 24 Apr 2020 09:37:29 -0500
|
||||
Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
|
||||
@@ -22,10 +22,10 @@ index e05e97727..cf3126a65 100644
|
||||
} 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 394c62f49..d98cf3bd9 100644
|
||||
index e57299f1e..efdc176e6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -908,6 +908,7 @@ public class PurpurWorldConfig {
|
||||
@@ -892,6 +892,7 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerCanBeLeashed = false;
|
||||
public int villagerSpawnIronGolemRadius = 0;
|
||||
public int villagerSpawnIronGolemLimit = 0;
|
||||
@@ -33,7 +33,7 @@ index 394c62f49..d98cf3bd9 100644
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -918,6 +919,7 @@ public class PurpurWorldConfig {
|
||||
@@ -902,6 +903,7 @@ public class PurpurWorldConfig {
|
||||
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
|
||||
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
|
||||
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0480f8f2291ede2dee7dd039eba0200dff9352f7 Mon Sep 17 00:00:00 2001
|
||||
From 77c2dc266e26e683a947a7e1b71a3f3e07a24b12 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 21 Feb 2020 17:04:51 -0600
|
||||
Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2e92177486778152b0b39ef788c8ce6bf011f6e8 Mon Sep 17 00:00:00 2001
|
||||
From b0b3faca30bd2c573d637ab29e277e61ae9a5c47 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 6 Jun 2019 22:15:46 -0500
|
||||
Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
|
||||
@@ -38,7 +38,7 @@ index cb36334e4..aa83ef169 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b557353ac..7c81d1149 100644
|
||||
index efdc176e6..face0f71a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -191,6 +191,15 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 028466f677b2b428af4e8edb61776d22c5f67c8d Mon Sep 17 00:00:00 2001
|
||||
From ec553622fedae875d0244e0e7de6bdc195bfabaa Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 6 Jul 2019 21:12:58 -0500
|
||||
Subject: [PATCH] MC-4 Fix - Item position desync
|
||||
@@ -1,4 +1,4 @@
|
||||
From 48fcbd27cb3e1c00b556eb3176c834c0c8044218 Mon Sep 17 00:00:00 2001
|
||||
From dfa8fa1518fab7f43b0458a0f548c12231b88a94 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Tue, 9 Jul 2019 20:56:47 -0500
|
||||
Subject: [PATCH] MC-56653 Fix - pig zombies aggro
|
||||
@@ -43,10 +43,10 @@ index 90bf12c73..c78876fc4 100644
|
||||
|
||||
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7c81d1149..9d56de22b 100644
|
||||
index face0f71a..b160e9628 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1001,6 +1001,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1009,6 +1009,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombiePigmanJockeyOnlyBaby = true;
|
||||
public double zombiePigmanJockeyChance = 0.05D;
|
||||
public boolean zombiePigmanJockeyTryExistingChickens = true;
|
||||
@@ -54,7 +54,7 @@ index 7c81d1149..9d56de22b 100644
|
||||
private void zombiePigmanSettings() {
|
||||
zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable);
|
||||
zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater);
|
||||
@@ -1008,6 +1009,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1016,6 +1017,7 @@ public class PurpurWorldConfig {
|
||||
zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby);
|
||||
zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance);
|
||||
zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens);
|
||||
@@ -1,4 +1,4 @@
|
||||
From 065dd032021686d0e4f41a026d36d5c3abdcc463 Mon Sep 17 00:00:00 2001
|
||||
From f3d4ecf04f5cebbc368a1241c826d679059c87ed Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 20 Jul 2013 22:40:56 -0400
|
||||
Subject: [PATCH] EMC - MonsterEggSpawn Event
|
||||
@@ -1,4 +1,4 @@
|
||||
From d530e207870e846e8d39556d4fa5341f5ae32c86 Mon Sep 17 00:00:00 2001
|
||||
From 84027803c6529ee821365ae5113e4661a395335c Mon Sep 17 00:00:00 2001
|
||||
From: Eearslya Sleiarion <eearslya@gmail.com>
|
||||
Date: Mon, 24 Jun 2019 21:27:32 -0700
|
||||
Subject: [PATCH] PaperPR - Add BellRingEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From ed64d76ed3cc08b9fc4edc418830b5ada0195b7d Mon Sep 17 00:00:00 2001
|
||||
From 51de97ed0fc5f6f99d478fa2da640ec1e6ce281c Mon Sep 17 00:00:00 2001
|
||||
From: chase <chasewhip20@gmail.com>
|
||||
Date: Sun, 15 Mar 2020 18:32:22 -0600
|
||||
Subject: [PATCH] PaperPR - Per World Spawn limits
|
||||
@@ -9,10 +9,10 @@ Subject: [PATCH] PaperPR - Per World Spawn limits
|
||||
2 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 9d56de22b..fa92f92b2 100644
|
||||
index b160e9628..2a81fed03 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -307,6 +307,17 @@ public class PurpurWorldConfig {
|
||||
@@ -309,6 +309,17 @@ public class PurpurWorldConfig {
|
||||
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From af3cd5ffa01ba64385f406055fce4fb330e6a401 Mon Sep 17 00:00:00 2001
|
||||
From 118bed10294e70631cbcfbb1c6855ac2acf9d562 Mon Sep 17 00:00:00 2001
|
||||
From: KennyTV <kennytv@t-online.de>
|
||||
Date: Mon, 20 Apr 2020 13:57:06 +0200
|
||||
Subject: [PATCH] PlayerItemCooldownEvent
|
||||
Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
|
||||
|
||||
---
|
||||
.../net/minecraft/server/ItemCooldownPlayer.java | 13 ++++++++++++-
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7ed9c2447cdcbe031c8c57e56eeb441907d591d6 Mon Sep 17 00:00:00 2001
|
||||
From 1e76ab115e36171480950f8768e7c8dc6aa47e52 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Fri, 25 Oct 2019 02:11:30 -0700
|
||||
Subject: [PATCH] Tuinity - Delay chunk unloads
|
||||
@@ -1,4 +1,4 @@
|
||||
From 402374f0f10f47c0432fe4a35e4a7fa4f0237fac Mon Sep 17 00:00:00 2001
|
||||
From 09f70d85e3cff6a76378ab5cba7abb3c35b5925c Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
||||
Date: Fri, 3 Apr 2020 02:21:13 -0700
|
||||
Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
|
||||
@@ -1,4 +1,4 @@
|
||||
From d47ce430a2c700345b0bdbc107996f77a2745a61 Mon Sep 17 00:00:00 2001
|
||||
From cfb56fa355d16be0c94fc3eaf681c059dd938f07 Mon Sep 17 00:00:00 2001
|
||||
From: tr7zw <tr7zw@live.de>
|
||||
Date: Thu, 5 Mar 2020 23:08:01 +0100
|
||||
Subject: [PATCH] YAPFA - Disable mojang profiler
|
||||
Reference in New Issue
Block a user