mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Move lang asset patch higher in the order
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 827cb8a486cdf87698a4e08c6816f6e73eee14d6 Mon Sep 17 00:00:00 2001
|
||||
From bbe8819ffe8e08b54d9adac64267a14ff41afd43 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 26 Mar 2020 13:17:09 -0500
|
||||
Subject: [PATCH] Add default asset lang en_us.json
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7433fa1e4eb6c458bdb7d057400e95f681331a91 Mon Sep 17 00:00:00 2001
|
||||
From 5a2d0e96173a5c2e25a5beca02725bf4d8aef7e3 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 18 Feb 2020 20:38:34 -0600
|
||||
Subject: [PATCH] Host our own timings
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Host our own timings
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 706d78757..f234832e6 100644
|
||||
index 706d787579..f234832e6f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -132,4 +132,8 @@ public class PurpurConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1ed8b405e0919cdc05075a5a5cac43c956531b09 Mon Sep 17 00:00:00 2001
|
||||
From 3e92fc1537c3c683c2cd75754bc631a0526ea67d Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 6 Feb 2020 19:53:59 -0600
|
||||
Subject: [PATCH] Ridables
|
||||
@@ -1,4 +1,4 @@
|
||||
From ed5d2229897c2b4516f626848f7fcc51512a2d01 Mon Sep 17 00:00:00 2001
|
||||
From 4a55a795e79248789fd711d7793d6c3d62d7e100 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 00:52:12 -0500
|
||||
Subject: [PATCH] Logger settings (suppressing pointless logs)
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
|
||||
4 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
|
||||
index 469e293c2..ca58302cf 100644
|
||||
index 469e293c25..ca58302cf7 100644
|
||||
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
|
||||
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
|
||||
@@ -79,6 +79,7 @@ public class GenericAttributes {
|
||||
@@ -23,7 +23,7 @@ index 469e293c2..ca58302cf 100644
|
||||
} else {
|
||||
a(attributeinstance, nbttagcompound);
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
||||
index 73402f2b5..1c2320cc5 100644
|
||||
index 73402f2b5a..1c2320cc54 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
|
||||
@@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
|
||||
@@ -35,7 +35,7 @@ index 73402f2b5..1c2320cc5 100644
|
||||
return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index f234832e6..345404c3a 100644
|
||||
index f234832e6f..345404c3a1 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -133,6 +133,15 @@ public class PurpurConfig {
|
||||
@@ -55,7 +55,7 @@ index f234832e6..345404c3a 100644
|
||||
getString("settings.timings.url", "https://timings.pl3x.net");
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
||||
index 049e9f98d..1d179cd5b 100644
|
||||
index 049e9f98de..1d179cd5bc 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
|
||||
@@ -254,6 +254,7 @@ public final class CraftLegacy {
|
||||
@@ -1,4 +1,4 @@
|
||||
From a1854a2210b80a98f0d1102c468cae4b067077bc Mon Sep 17 00:00:00 2001
|
||||
From 04db975c6ba253f192a714ed54713d701b799180 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 15 Dec 2019 12:53:59 -0600
|
||||
Subject: [PATCH] Disable outdated build check
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable outdated build check
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 7fc56f67f..d1af8e9a9 100644
|
||||
index 7fc56f67fd..d1af8e9a92 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -227,7 +227,7 @@ public class Main {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8177a50b1227b0115e62de1caa68cbcd7d8ff643 Mon Sep 17 00:00:00 2001
|
||||
From 2cc54bc467b167771d2b2ce9d5f5401efc076e93 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Wed, 1 Jan 2020 20:12:39 -0600
|
||||
Subject: [PATCH] Add obfhelpers for plugin use
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
|
||||
3 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
||||
index fb97c51bb..50ed4001d 100644
|
||||
index fb97c51bb1..50ed4001d1 100644
|
||||
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
||||
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
|
||||
@@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
|
||||
@@ -30,7 +30,7 @@ index fb97c51bb..50ed4001d 100644
|
||||
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index d6e43313b..4730c2beb 100644
|
||||
index d6e43313bf..4730c2beb7 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -595,6 +595,7 @@ public final class ItemStack {
|
||||
@@ -42,7 +42,7 @@ index d6e43313b..4730c2beb 100644
|
||||
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
|
||||
return this.tag.getCompound(s);
|
||||
diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
|
||||
index bea4a0b80..c6481c7ff 100644
|
||||
index bea4a0b808..c6481c7ff1 100644
|
||||
--- a/src/main/java/net/minecraft/server/NBTTagString.java
|
||||
+++ b/src/main/java/net/minecraft/server/NBTTagString.java
|
||||
@@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
|
||||
@@ -1,4 +1,4 @@
|
||||
From e31cbd8c44876a916fbe6e769768a588edcba923 Mon Sep 17 00:00:00 2001
|
||||
From 0f8bc1ca962afee61c0d75d6fb9441174e5beac3 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 9 May 2019 14:27:37 -0500
|
||||
Subject: [PATCH] Silk touch spawners
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Silk touch spawners
|
||||
3 files changed, 47 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index e40375b67..b29ed1cfa 100644
|
||||
index e40375b67a..b29ed1cfa7 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -494,6 +494,7 @@ public class Block implements IMaterial {
|
||||
@@ -22,7 +22,7 @@ index e40375b67..b29ed1cfa 100644
|
||||
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
|
||||
float f = 0.5F;
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
|
||||
index 5296fdf16..69d04f6cb 100644
|
||||
index 5296fdf168..69d04f6cbf 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
|
||||
@@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
|
||||
@@ -67,7 +67,7 @@ index 5296fdf16..69d04f6cb 100644
|
||||
public void dropNaturally(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
|
||||
super.dropNaturally(iblockdata, world, blockposition, itemstack);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
index a0d932c40..0dd9897b9 100644
|
||||
index a0d932c403..0dd9897b99 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
@@ -136,10 +136,17 @@ public class EntityTypes<T extends Entity> {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 99c20d329c4f6dba4ca3674effb9600c66684fac Mon Sep 17 00:00:00 2001
|
||||
From 68aa291efeee7deee00f138837f8657216e05a4b Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 12 May 2019 00:43:12 -0500
|
||||
Subject: [PATCH] Give giants AI
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3e1e3d6787211042f3d69085b3ba3edc59cfb904 Mon Sep 17 00:00:00 2001
|
||||
From 0de182cc97edd94a0e19a585bc7315e97eed4560 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 5 Jul 2019 11:09:25 -0500
|
||||
Subject: [PATCH] Illusioners AI settings
|
||||
@@ -1,4 +1,4 @@
|
||||
From ccda13385828a4232674fa9e3d4896a1490c2745 Mon Sep 17 00:00:00 2001
|
||||
From 9fad2a85490a3dbb8b75b680ea97fe5e91f65364 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 7 Jul 2019 19:52:16 -0500
|
||||
Subject: [PATCH] Zombie horse naturally spawn
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Zombie horse naturally spawn
|
||||
2 files changed, 14 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index ef021bca36..3e5dc93dff 100644
|
||||
index 92b79e3e71..f0a5d82a12 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -922,12 +922,18 @@ public class WorldServer extends World {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 72722ee8720eb09f4d504a8f360350406c0f0314 Mon Sep 17 00:00:00 2001
|
||||
From 99f25236954bb1f5ebf4259624620d9f2d343e16 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 29 Nov 2019 22:37:44 -0600
|
||||
Subject: [PATCH] Charged creeper naturally spawn
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Charged creeper naturally spawn
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
index 48fd8e716..ce366f401 100644
|
||||
index 48fd8e716b..ce366f401f 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
@@ -87,6 +87,17 @@ public class EntityCreeper extends EntityMonster {
|
||||
@@ -31,7 +31,7 @@ index 48fd8e716..ce366f401 100644
|
||||
public void b(NBTTagCompound nbttagcompound) {
|
||||
super.b(nbttagcompound);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 300622e50..cc2bddd94 100644
|
||||
index 1a8b8de8dd..e38d0bea2c 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -148,10 +148,12 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From bee73c93e9351532bf2778c1950d85fc34da5be8 Mon Sep 17 00:00:00 2001
|
||||
From ece55f9066d93e552bcc71ecf02e88ef0695209e Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 31 Aug 2019 17:47:11 -0500
|
||||
Subject: [PATCH] Rabbit naturally spawn toast and killer
|
||||
@@ -1,4 +1,4 @@
|
||||
From 44037b56639b1700d3743cab9f1d0e3e1f2b54b4 Mon Sep 17 00:00:00 2001
|
||||
From a540d48b443418c6af9702016b98500754643999 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 26 Dec 2019 18:52:55 -0600
|
||||
Subject: [PATCH] Cat spawning options
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Cat spawning options
|
||||
2 files changed, 22 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
index 6024478dc..4b55c07d4 100644
|
||||
index 6024478dc0..4b55c07d41 100644
|
||||
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
@@ -15,7 +15,7 @@ public class MobSpawnerCat {
|
||||
@@ -57,7 +57,7 @@ index 6024478dc..4b55c07d4 100644
|
||||
return list.size() < 1 ? this.a(blockposition, world) : 0;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ce677915c..9b60d17bd 100644
|
||||
index 7df44adc8a..8ecf47f25a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -101,10 +101,16 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7467fdc9633183e91a0df264025d83bb8904ad7a Mon Sep 17 00:00:00 2001
|
||||
From 09f9bab4945792e037ea709f8bb04d4d6e28563a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 2 Jan 2020 01:23:22 -0600
|
||||
Subject: [PATCH] Fix non black cat types spawning in swamp huts
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix non black cat types spawning in swamp huts
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
index 4b55c07d4..fa2222355 100644
|
||||
index 4b55c07d41..fa2222355f 100644
|
||||
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
|
||||
@@ -84,8 +84,9 @@ public class MobSpawnerCat {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1380c4e6cc72f150422148205ee525f5f4c78811 Mon Sep 17 00:00:00 2001
|
||||
From a2471acc436a5610adac334f3d1af28afbab6bfc Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 4 May 2019 01:10:30 -0500
|
||||
Subject: [PATCH] Cows eat mushrooms
|
||||
@@ -1,4 +1,4 @@
|
||||
From e9387426755d77b81b56818592f53b00c01e3a31 Mon Sep 17 00:00:00 2001
|
||||
From bb3fb730b87283229a93f29a8dbf9216d579773a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 3 May 2019 23:53:16 -0500
|
||||
Subject: [PATCH] Fix cow rotation when shearing mooshroom
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
index b20f4afd3..02d76a6c6 100644
|
||||
index b20f4afd3f..02d76a6c61 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||
@@ -118,7 +118,13 @@ public class EntityMushroomCow extends EntityCow {
|
||||
@@ -1,4 +1,4 @@
|
||||
From afe89d5c1e49db850a854616a6f2b2d17a0c0c32 Mon Sep 17 00:00:00 2001
|
||||
From 9d007d6a04a298735ff3205f765d485f53e5187b Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 12 May 2019 01:14:46 -0500
|
||||
Subject: [PATCH] Pigs give saddle back
|
||||
@@ -1,4 +1,4 @@
|
||||
From b40fb16fbb5594774bf09be135bd6916d48f683e Mon Sep 17 00:00:00 2001
|
||||
From ccf03560068f393b01dec6381ef554a398fcca8b Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 18 May 2019 16:59:52 -0500
|
||||
Subject: [PATCH] Phantoms do not spawn on creative players
|
||||
@@ -1,4 +1,4 @@
|
||||
From a44f4c1e877acf7424367aec36a4c18d84d01bdc Mon Sep 17 00:00:00 2001
|
||||
From 6fba0afbcbb31b1a7ae57826b8482e80c774143f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 29 Nov 2019 20:33:41 -0600
|
||||
Subject: [PATCH] Phantoms only attack insomniacs
|
||||
@@ -1,4 +1,4 @@
|
||||
From 00240511775eaed6caceb9470036aff670cbf305 Mon Sep 17 00:00:00 2001
|
||||
From 274dddbd8d5e6c0f4f89b267d26bdbc5167a01ec Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 9 May 2019 18:26:06 -0500
|
||||
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
|
||||
@@ -1,4 +1,4 @@
|
||||
From dd31f6225c3e35abed6df3697ddda5bf5d494496 Mon Sep 17 00:00:00 2001
|
||||
From 225337ac29d2feab321dbd16378858d580390d34 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 3 May 2019 23:58:44 -0500
|
||||
Subject: [PATCH] Snowman drop and put back pumpkin
|
||||
@@ -1,4 +1,4 @@
|
||||
From 413346301d87c28a9fdc6a12ad8be444a9b77226 Mon Sep 17 00:00:00 2001
|
||||
From e9271db5618f471d60085219f5a534a3b06947a0 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 7 Feb 2020 04:42:57 -0600
|
||||
Subject: [PATCH] Ender dragon always drop egg
|
||||
@@ -1,4 +1,4 @@
|
||||
From dd6599667bd2ecb07d3aa45854736c5f6f1547e2 Mon Sep 17 00:00:00 2001
|
||||
From 65cef54fdf6cbcbaba7af01302c6afca847bb41a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 24 Aug 2019 14:42:54 -0500
|
||||
Subject: [PATCH] Ender dragon always drop full exp
|
||||
@@ -1,4 +1,4 @@
|
||||
From b430451cc77cb298176ce6b63bbb1c952b6af4e7 Mon Sep 17 00:00:00 2001
|
||||
From e5ea7012426b87fd722637994c0e6a2cda21a44f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 24 May 2019 02:39:25 -0500
|
||||
Subject: [PATCH] Signs editable on right click
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Signs editable on right click
|
||||
3 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
|
||||
index 8a31054a1..d20849ce2 100644
|
||||
index 8a31054a1d..d20849ce2b 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockSign.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockSign.java
|
||||
@@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
|
||||
@@ -32,7 +32,7 @@ index 8a31054a1..d20849ce2 100644
|
||||
} else {
|
||||
return EnumInteractionResult.PASS;
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||
index 0e9a90b70..099d98e04 100644
|
||||
index 0e9a90b70f..099d98e04c 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||
@@ -109,6 +109,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
||||
@@ -44,7 +44,7 @@ index 0e9a90b70..099d98e04 100644
|
||||
// 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 cd4b4ee29..4609c3c8b 100644
|
||||
index bc2f7c0846..82b58225bd 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From c5acbc2e14ec1b99970f9787658a08c88bb11aaf Mon Sep 17 00:00:00 2001
|
||||
From 27dbb306c7a2771ec35c87c4632a61a16e02f1c6 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Tue, 4 Jun 2019 15:50:08 -0500
|
||||
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
|
||||
index 4bb21c48b..30f16db02 100644
|
||||
index 4bb21c48bd..30f16db02c 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
|
||||
@@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener {
|
||||
@@ -1,4 +1,4 @@
|
||||
From cfa9bf07f2f960838299f5ea9db29fa3e397430f Mon Sep 17 00:00:00 2001
|
||||
From 8f7d5e29a85cd3270fa622fb6e5cbd9dd19f0a23 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] Add turtle egg block options - fixes MC-168772
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Add turtle egg block options - fixes MC-168772
|
||||
2 files changed, 27 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
|
||||
index cb36334e4..aa83ef169 100644
|
||||
index cb36334e41..aa83ef1699 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
|
||||
@@ -157,6 +157,23 @@ public class BlockTurtleEgg extends Block {
|
||||
@@ -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 4609c3c8b..e2604d54b 100644
|
||||
index 82b58225bd..dcf0f58a29 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -70,6 +70,15 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 582fccee111ac1c769a4719aaa7a17260d378e00 Mon Sep 17 00:00:00 2001
|
||||
From 8b7a72b5fc6b8facf08e950b362d6117f9bf2ae7 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 15 Jun 2019 03:12:15 -0500
|
||||
Subject: [PATCH] Make Iron Golems Swim
|
||||
@@ -1,4 +1,4 @@
|
||||
From 382783f9a102182aa6b090afe57b5d09e3e63415 Mon Sep 17 00:00:00 2001
|
||||
From a3826309f40a5b7e8a9591f9f5989d1e71f70875 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 21 Jun 2019 14:37:10 -0500
|
||||
Subject: [PATCH] Allow soil to moisten from water directly under it
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
|
||||
2 files changed, 12 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
|
||||
index b6561f2c7..f2ab3ee01 100644
|
||||
index b6561f2c79..f2ab3ee011 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockSoil.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockSoil.java
|
||||
@@ -1,6 +1,5 @@
|
||||
@@ -47,7 +47,7 @@ index b6561f2c7..f2ab3ee01 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 55c026d73..85eaf1a7a 100644
|
||||
index 114fe87f4a..08cef8e645 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 16f84e5613b816087c467ed8acb54908279e632e Mon Sep 17 00:00:00 2001
|
||||
From e1e62c3c0b3debfef222b4471c6ac37dff2d1284 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 02:32:40 -0500
|
||||
Subject: [PATCH] Controllable Minecarts
|
||||
@@ -1,4 +1,4 @@
|
||||
From bcb659268b65188ce411f5f4905aab0cf6e1e58e Mon Sep 17 00:00:00 2001
|
||||
From b7e2398a24b0f0fd210fd49fe0f6f87971d5f715 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 6 Jun 2019 17:40:30 -0500
|
||||
Subject: [PATCH] Signs allow color codes
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Signs allow color codes
|
||||
4 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index fc185136fb..24ce25ba60 100644
|
||||
index cf37baee39..561588ddaa 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1162,6 +1162,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -67,7 +67,7 @@ index 099d98e04c..19d76c8cce 100644
|
||||
@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 dfa6318039..7395abfb6f 100644
|
||||
index 086bd505cb..bf9093158b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -76,8 +76,10 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4e45ec9fa8ffe2a833f7fd36ecb85a06c8e1d3c4 Mon Sep 17 00:00:00 2001
|
||||
From 69b904fee00667f7a29e01ba169c27d34fca4002 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 19 May 2019 18:11:53 -0500
|
||||
Subject: [PATCH] Campfires have regen effect
|
||||
@@ -12,7 +12,7 @@ Subject: [PATCH] Campfires have regen effect
|
||||
5 files changed, 92 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
index 6303be944..65f8d803b 100644
|
||||
index 6303be944c..65f8d803b8 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
@@ -8,7 +8,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
|
||||
@@ -25,7 +25,7 @@ index 6303be944..65f8d803b 100644
|
||||
public static final BlockStateDirection e = BlockProperties.N;
|
||||
private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 6ca11091c..2128e968a 100644
|
||||
index 47b19b7754..106fb5c027 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2772,10 +2772,19 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -52,7 +52,7 @@ index 6ca11091c..2128e968a 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
|
||||
index 2f9a73ea3..2398499bc 100644
|
||||
index 2f9a73ea33..2398499bcb 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPotion.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
|
||||
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
|
||||
@@ -96,7 +96,7 @@ index 2f9a73ea3..2398499bc 100644
|
||||
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
|
||||
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||||
index a1580b8c6..618ca2d76 100644
|
||||
index a1580b8c6d..618ca2d763 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||||
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
|
||||
@@ -165,7 +165,7 @@ index a1580b8c6..618ca2d76 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7395abfb6..fc98e8249 100644
|
||||
index bf9093158b..2eb483d30f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -71,6 +71,29 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 006310f268f3ecf5e62facd7dbb39244c08be5c3 Mon Sep 17 00:00:00 2001
|
||||
From 53548208fe3fefe1ed7890937cf10686200f2249 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Wed, 3 Jul 2019 23:58:31 -0500
|
||||
Subject: [PATCH] Disable loot drops on death by cramming
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 2128e968a..76a925f7a 100644
|
||||
index 106fb5c027..0310e4ddd1 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -24,7 +24,7 @@ index 2128e968a..76a925f7a 100644
|
||||
deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
|
||||
} else {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index fc98e8249..7cd02e6b2 100644
|
||||
index 2eb483d30f..7d8d2f6d9d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -121,6 +121,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From c15b54306d8910756947ed6fa737338b3796ce6d Mon Sep 17 00:00:00 2001
|
||||
From 05886144a600b5aaffa1f451d61ae74d1e86f8d8 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 6 Jun 2019 21:30:49 -0500
|
||||
Subject: [PATCH] Campfires burn out in rain
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires burn out in rain
|
||||
3 files changed, 19 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index b29ed1cfa..d7911c342 100644
|
||||
index b29ed1cfa7..d7911c3421 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -387,7 +387,7 @@ public class Block implements IMaterial {
|
||||
@@ -23,7 +23,7 @@ index b29ed1cfa..d7911c342 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
index 65f8d803b..3b95dfaaa 100644
|
||||
index 65f8d803b8..3b95dfaaae 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
|
||||
@@ -58,7 +58,7 @@ index 65f8d803b..3b95dfaaa 100644
|
||||
public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
|
||||
if ((Boolean) iblockdata.get(BlockCampfire.d)) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7cd02e6b2..bfd9babf2 100644
|
||||
index 7d8d2f6d9d..1e31357340 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -81,6 +81,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From d29c8ceeb26584c7f0b072ddf4ece5eb62c3b79f Mon Sep 17 00:00:00 2001
|
||||
From 36c0c6269cb8415a955b57567571dfa46ca7b69a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 23 May 2019 16:20:21 -0500
|
||||
Subject: [PATCH] Campfires should fall with gravity
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires should fall with gravity
|
||||
2 files changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
index 3b95dfaaa..418fa6d1f 100644
|
||||
index 3b95dfaaae..418fa6d1fe 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
|
||||
@@ -9,7 +9,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
|
||||
@@ -59,7 +59,7 @@ index 3b95dfaaa..418fa6d1f 100644
|
||||
|
||||
if (flag) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index bfd9babf2..5e57646ce 100644
|
||||
index 1e31357340..9324fdd095 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -82,6 +82,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 400e1baed69b069bb3b98ddd37b4e3209b4a7063 Mon Sep 17 00:00:00 2001
|
||||
From 7b2d402156cbc1ae5b09c6696e4b0483db5b8201 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 6 Jul 2019 17:00:04 -0500
|
||||
Subject: [PATCH] Dont send useless entity packets
|
||||
@@ -1,4 +1,4 @@
|
||||
From a0d90424c8242684df2b1754d0b3708a5ef20115 Mon Sep 17 00:00:00 2001
|
||||
From 00b412de367fcc162b799d0758d4df1346e42cf8 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] Fix item position desync (MC-4)
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Fix item position desync (MC-4)
|
||||
3 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
index 1dc29d7cd..bb0b7b98e 100644
|
||||
index 6449663b57..bc349c01dc 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
@@ -130,6 +130,12 @@ public class EntityTrackerEntry {
|
||||
@@ -27,7 +27,7 @@ index 1dc29d7cd..bb0b7b98e 100644
|
||||
boolean flag2 = flag1 || this.tickCounter % 60 == 0;
|
||||
boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
|
||||
index 5b1d95935..0010448e3 100644
|
||||
index 5b1d959354..0010448e3a 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
|
||||
@@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
|
||||
@@ -44,7 +44,7 @@ index 5b1d95935..0010448e3 100644
|
||||
return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index e21931216..3670b4d48 100644
|
||||
index e219312168..3670b4d48d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -143,8 +143,10 @@ public class PurpurConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1fa6081a9f5c7bf0fc63a0530d266b7783e53727 Mon Sep 17 00:00:00 2001
|
||||
From 285f8173d5c86b39852cadd451d8ec5b5b5cfc71 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 7 Feb 2020 09:45:09 -0600
|
||||
Subject: [PATCH] Rate limit incoming packets from players
|
||||
@@ -12,7 +12,7 @@ Subject: [PATCH] Rate limit incoming packets from players
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/network/PacketLimiter.java
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
index 211a6d720..a1304240d 100644
|
||||
index 77aa911c98..802295681a 100644
|
||||
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
@@ -150,6 +150,13 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||||
@@ -30,7 +30,7 @@ index 211a6d720..a1304240d 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 895e34ed3..67afa457e 100644
|
||||
index 895e34ed34..67afa457e8 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -140,6 +140,62 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -97,7 +97,7 @@ index 895e34ed3..67afa457e 100644
|
||||
public void tick() {
|
||||
this.syncPosition();
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 3670b4d48..e1a1ef860 100644
|
||||
index 3670b4d48d..e1a1ef860a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -142,6 +142,18 @@ public class PurpurConfig {
|
||||
@@ -121,7 +121,7 @@ index 3670b4d48..e1a1ef860 100644
|
||||
private static void dontSendUselessEntityPackets() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/network/PacketLimiter.java b/src/main/java/net/pl3x/purpur/network/PacketLimiter.java
|
||||
new file mode 100644
|
||||
index 000000000..e51e7eb9d
|
||||
index 0000000000..e51e7eb9d0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/network/PacketLimiter.java
|
||||
@@ -0,0 +1,147 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
From 181a0d5d2e8e7f5decf1c5634ff7c3a61e3673a1 Mon Sep 17 00:00:00 2001
|
||||
From 53a6720daaa77fdc79d9d84ff31511fb88640c60 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] Fix pig zombies (MC-56653)
|
||||
@@ -1,4 +1,4 @@
|
||||
From 42956f3059fbaa0060410ada3bb5ba324071af8c Mon Sep 17 00:00:00 2001
|
||||
From 510dfab4193957ab9509269a01eaa00f8f309d1a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 8 Aug 2019 15:29:15 -0500
|
||||
Subject: [PATCH] Implement AFK API
|
||||
@@ -192,7 +192,7 @@ index 67afa457e8..2659da1881 100644
|
||||
if (from.getX() != Double.MAX_VALUE) {
|
||||
Location oldTo = to.clone();
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 3e5dc93dff..ff38e6c69c 100644
|
||||
index f0a5d82a12..5d14939873 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -746,7 +746,7 @@ public class WorldServer extends World {
|
||||
@@ -240,7 +240,7 @@ index 84a89d7875..555039f531 100644
|
||||
public boolean batRidableInWater = false;
|
||||
public boolean batRequireShiftToMount = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 516a016480..7451e120cd 100644
|
||||
index b5ffd14413..f413d0a181 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2125,4 +2125,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 44821e8ea31928825b1838dbaea68402eadeb72c Mon Sep 17 00:00:00 2001
|
||||
From 314352c191fb1618442c3f4c6da3182d05bdc133 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Wed, 10 Jul 2019 20:43:05 -0500
|
||||
Subject: [PATCH] Option to toggle milk curing bad omen
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
|
||||
index 6b255e09a..e1d3894ab 100644
|
||||
index 6b255e09ac..e1d3894ab7 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
|
||||
@@ -20,7 +20,10 @@ public class ItemMilkBucket extends Item {
|
||||
@@ -24,7 +24,7 @@ index 6b255e09a..e1d3894ab 100644
|
||||
|
||||
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 95f1dcf0d..3dbcd3f0e 100644
|
||||
index 555039f531..598fb1659d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -126,6 +126,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From d57dfeff220bc423b561e2a9f988d93a720422ff Mon Sep 17 00:00:00 2001
|
||||
From 0b24837b907ccd580b2c8a84d88df8fb135d7022 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 14 Jul 2019 19:52:47 -0500
|
||||
Subject: [PATCH] Mending mends most damages equipment first
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
|
||||
4 files changed, 36 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
|
||||
index d96c03a1a..da1cfc1d3 100644
|
||||
index d96c03a1a1..da1cfc1d3f 100644
|
||||
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
|
||||
@@ -246,9 +246,32 @@ public class EnchantmentManager {
|
||||
@@ -49,7 +49,7 @@ index d96c03a1a..da1cfc1d3 100644
|
||||
}
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||
index 53c6c3389..0fae3693c 100644
|
||||
index 53c6c33892..0fae3693c9 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||
@@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
|
||||
@@ -62,7 +62,7 @@ index 53c6c3389..0fae3693c 100644
|
||||
if (entry != null) {
|
||||
ItemStack itemstack = (ItemStack) entry.getValue();
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index 4730c2beb..4fe503808 100644
|
||||
index 4730c2beb7..4fe5038083 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -369,10 +369,19 @@ public final class ItemStack {
|
||||
@@ -86,7 +86,7 @@ index 4730c2beb..4fe503808 100644
|
||||
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 3dbcd3f0e..8e6e141dc 100644
|
||||
index 598fb1659d..d5526c15a0 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -127,6 +127,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1fe23b7cbb0bfa328061798143acc96a2c1c9ea0 Mon Sep 17 00:00:00 2001
|
||||
From 2bc39f965d2f340ad49e7cb5b668ce51d0e0810f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 13 Jul 2019 15:56:22 -0500
|
||||
Subject: [PATCH] Tulips change fox type
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9c97984200f21dd43a096e3365de0965c31d7553 Mon Sep 17 00:00:00 2001
|
||||
From 85b183ef1f863ad3be4f217412044f1031f2460f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Mon, 22 Jul 2019 14:24:26 -0500
|
||||
Subject: [PATCH] Implement a hard limit for pillager outpost spawns
|
||||
@@ -1,4 +1,4 @@
|
||||
From 77672060f4f578b9019cfb1b7452fd03a0d8dd0a Mon Sep 17 00:00:00 2001
|
||||
From 6bec53634c5c7957ab5fe5a76d5b3ba9165393a4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 16 Jan 2020 14:59:16 -0600
|
||||
Subject: [PATCH] Make the GUI better
|
||||
@@ -1,4 +1,4 @@
|
||||
From b10f29e98fb9e452fa1a0df4f40176134d67f6aa Mon Sep 17 00:00:00 2001
|
||||
From 70da77a02d7fda3940bc3fb26b77bb7a77487923 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 21 Jul 2019 18:01:46 -0500
|
||||
Subject: [PATCH] Players should not cram to death
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Players should not cram to death
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 4694edc5de..407730ec2d 100644
|
||||
index 31d34e51e9..c0eb1a45d9 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1136,7 +1136,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4a5f495a9a5c4510eb17bbe933e0a420b1f4c8d8 Mon Sep 17 00:00:00 2001
|
||||
From 52cdc501405004c1792d660f8d6c25c13dc3ed70 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 11 Jan 2020 23:12:52 -0600
|
||||
Subject: [PATCH] Add EntityPortalReadyEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From acca1c1f6497cee54cfe4ebc7b49781a4ae98751 Mon Sep 17 00:00:00 2001
|
||||
From 2b3a34f078c59d18736fef8715f9a2bf8bab89ba Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 25 Jul 2019 18:07:37 -0500
|
||||
Subject: [PATCH] Implement elytra settings
|
||||
@@ -1,4 +1,4 @@
|
||||
From d5c4ac70d6e1ba686d3e6869cbe6f5042282df1e Mon Sep 17 00:00:00 2001
|
||||
From c688c4492c5bbd6652df6b97f13f5b9120804d22 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 30 Jan 2020 00:41:24 -0600
|
||||
Subject: [PATCH] Add tick times API
|
||||
@@ -1,4 +1,4 @@
|
||||
From 95d6bded04a9fdf673641171cccb6fd814628094 Mon Sep 17 00:00:00 2001
|
||||
From bdd5cee287f706ab3263daa516e19d930a7ae459 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 1 Aug 2019 19:15:12 -0500
|
||||
Subject: [PATCH] Add blacklist option for grindstone
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone
|
||||
3 files changed, 35 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
|
||||
index ed88e208d..fcfb4abdc 100644
|
||||
index ed88e208d0..fcfb4abdc2 100644
|
||||
--- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
|
||||
+++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
|
||||
@@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container {
|
||||
@@ -51,7 +51,7 @@ index ed88e208d..fcfb4abdc 100644
|
||||
Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
|
||||
Iterator iterator = map.entrySet().iterator();
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index 7b7a0a7cb..6b45bc17c 100644
|
||||
index 7b7a0a7cb1..6b45bc17cf 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -541,6 +541,12 @@ public final class ItemStack {
|
||||
@@ -68,7 +68,7 @@ index 7b7a0a7cb..6b45bc17c 100644
|
||||
return this.getItem().f(this);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7cfc757db..2795957dc 100644
|
||||
index e5de7cbe05..c9303598fa 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;
|
||||
@@ -1,4 +1,4 @@
|
||||
From e2a58e67b5ef7f48de8d212f4bfebe4713cd8c39 Mon Sep 17 00:00:00 2001
|
||||
From 29f5f31894e0f8620a7218a9a65c56fd49e2a75f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Tue, 23 Jul 2019 10:07:16 -0500
|
||||
Subject: [PATCH] Implement lagging threshold
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6c887d74303440f4bef125680fdbac6b6ee626ca Mon Sep 17 00:00:00 2001
|
||||
From a2a575b9b7b50227ae909299840c4843c6a439c4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Tue, 23 Jul 2019 08:28:21 -0500
|
||||
Subject: [PATCH] Implement configurable villager brain ticks
|
||||
@@ -1,4 +1,4 @@
|
||||
From 807f48b99803a8b60c3d48db47d02cdfb3c8a4da Mon Sep 17 00:00:00 2001
|
||||
From 2d0168c35206e6f4179260d914d19e5d4a58fbd6 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 17 Aug 2019 15:27:09 -0500
|
||||
Subject: [PATCH] Add option for zombies targetting turtle eggs
|
||||
@@ -1,4 +1,4 @@
|
||||
From bd8c20ce4a44d00b799343ec8485e487536f8978 Mon Sep 17 00:00:00 2001
|
||||
From e083f2d13b813ff4a7e9e1834de3f005406e9120 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 23 Aug 2019 20:57:29 -0500
|
||||
Subject: [PATCH] Implement bamboo growth settings
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings
|
||||
2 files changed, 14 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
index 02c548dd9..016ceebb9 100644
|
||||
index 02c548dd9c..016ceebb9d 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
@@ -10,7 +10,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
|
||||
@@ -76,7 +76,7 @@ index 02c548dd9..016ceebb9 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 666de04a8..814ff5935 100644
|
||||
index 719c8ea602..acb5a9f109 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -72,6 +72,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 91ba7d94e9bdd9c215845d3eb8ab4eb3d3edc64f Mon Sep 17 00:00:00 2001
|
||||
From 1ebcee771cc5e20ee628d9dd25841efbb968ec46 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 21 Jul 2019 18:06:20 -0500
|
||||
Subject: [PATCH] Climbing should not bypass cramming gamerule
|
||||
@@ -1,4 +1,4 @@
|
||||
From 894c6ad002780f2aff249b709dccbdd389d528c4 Mon Sep 17 00:00:00 2001
|
||||
From 5f6185e24488dc16df1aec88bf4d5c461cbd4b24 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 23 Aug 2019 21:56:31 -0500
|
||||
Subject: [PATCH] Option for slimes not pushable
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Option for slimes not pushable
|
||||
3 files changed, 22 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
|
||||
index b29525c40..1e72b3bbc 100644
|
||||
index b29525c40d..1e72b3bbc5 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockPiston.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
|
||||
@@ -332,6 +332,16 @@ public class BlockPiston extends BlockDirectional {
|
||||
@@ -31,7 +31,7 @@ index b29525c40..1e72b3bbc 100644
|
||||
|
||||
if (event.isCancelled()) {
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
|
||||
index 01f32659d..52ab86f0b 100644
|
||||
index 01f32659d9..52ab86f0b1 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockSlime.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockSlime.java
|
||||
@@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent {
|
||||
@@ -47,7 +47,7 @@ index 01f32659d..52ab86f0b 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 2537a5add..7be2e0181 100644
|
||||
index 2537a5add3..7be2e01814 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -166,6 +166,11 @@ public class PurpurConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 61fa60bd5c0da1ec64de4fe0fe29381391439cee Mon Sep 17 00:00:00 2001
|
||||
From 536a11356cac67d0e1ac04a7ee9f543cd4b949cb Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 26 May 2019 15:19:14 -0500
|
||||
Subject: [PATCH] Bring back server name
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3d8ae1d3425c6aec44d0b03825a01e278e949cb0 Mon Sep 17 00:00:00 2001
|
||||
From 61e0d04f452e65528c3a85b0329ae0ba13f39009 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 25 Aug 2019 00:09:52 -0500
|
||||
Subject: [PATCH] Dispenser curse of binding protection
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection
|
||||
3 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 3ef4f8db4..742745cb4 100644
|
||||
index 3ef4f8db46..742745cb47 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -920,6 +920,13 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
@@ -28,7 +28,7 @@ index 3ef4f8db4..742745cb4 100644
|
||||
Item item = itemstack.getItem();
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java
|
||||
index df8c42bfb..a4b3d0c29 100644
|
||||
index df8c42bfbd..a4b3d0c298 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemArmor.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemArmor.java
|
||||
@@ -31,7 +31,7 @@ public class ItemArmor extends Item {
|
||||
@@ -49,7 +49,7 @@ index df8c42bfb..a4b3d0c29 100644
|
||||
return this.b;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 9319c3b74..1637f66ae 100644
|
||||
index 551327db8f..e4131cb08d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -106,6 +106,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 562293d312599c5bbfd434145d14f3059b8ded9e Mon Sep 17 00:00:00 2001
|
||||
From 53c6be6e52b5facec2f355c474d0717b39b8f26d Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 5 May 2019 12:58:45 -0500
|
||||
Subject: [PATCH] Implement LivingEntity safeFallDistance
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
|
||||
4 files changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
|
||||
index 4296aaa07..a2e3e6001 100644
|
||||
index 4296aaa074..a2e3e60012 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
|
||||
@@ -5,6 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
|
||||
@@ -25,7 +25,7 @@ index 4296aaa07..a2e3e6001 100644
|
||||
|
||||
// Purpur start
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
index 55e18e4c7..b14f67b3a 100644
|
||||
index 55e18e4c7a..b14f67b3a3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
@@ -229,7 +229,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
||||
@@ -38,7 +38,7 @@ index 55e18e4c7..b14f67b3a 100644
|
||||
|
||||
protected int getChestSlots() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index cd4526039..60e2b4268 100644
|
||||
index 2d85186254..a42d65ed7a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -59,7 +59,7 @@ index cd4526039..60e2b4268 100644
|
||||
|
||||
protected void cZ() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index 8ffa3cb05..3dd0faea7 100644
|
||||
index 8ffa3cb059..3dd0faea79 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -739,4 +739,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 44b0e303a2e619c3302ecc4b39bfb40982b5b678 Mon Sep 17 00:00:00 2001
|
||||
From 1001ae1fcc1a06e46622026b173f9641bbb419ef Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 7 Sep 2019 22:47:59 -0500
|
||||
Subject: [PATCH] Add option for boats to eject players on land
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for boats to eject players on land
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
|
||||
index 563fc8ced..479ed7c7b 100644
|
||||
index 563fc8ced0..479ed7c7bc 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityBoat.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
|
||||
@@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
|
||||
@@ -21,7 +21,7 @@ index 563fc8ced..479ed7c7b 100644
|
||||
} 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 1637f66ae..028a169cb 100644
|
||||
index e4131cb08d..2a5f7f96f5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From bd3f839e3d15c467397c5cf3e4ae3eecee89b9ed Mon Sep 17 00:00:00 2001
|
||||
From 28623c88638c0ed7034189a99b02d231cb111f06 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 31 May 2019 21:24:33 -0500
|
||||
Subject: [PATCH] Advancement API Additions
|
||||
@@ -14,7 +14,7 @@ Subject: [PATCH] Advancement API Additions
|
||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
|
||||
index 4b85551fa..4cba4187a 100644
|
||||
index 4b85551faf..4cba4187a0 100644
|
||||
--- a/src/main/java/net/minecraft/server/Advancement.java
|
||||
+++ b/src/main/java/net/minecraft/server/Advancement.java
|
||||
@@ -65,7 +65,7 @@ public class Advancement {
|
||||
@@ -27,7 +27,7 @@ index 4b85551fa..4cba4187a 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
|
||||
index e8172d56f..976c85ef1 100644
|
||||
index e8172d56fe..976c85ef1b 100644
|
||||
--- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
|
||||
+++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
|
||||
@@ -16,10 +16,11 @@ public class AdvancementDisplay {
|
||||
@@ -75,7 +75,7 @@ index e8172d56f..976c85ef1 100644
|
||||
return this.h;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
|
||||
index a9c49a434..551a84547 100644
|
||||
index a9c49a4348..551a845476 100644
|
||||
--- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
|
||||
+++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
|
||||
@@ -1,14 +1,25 @@
|
||||
@@ -107,7 +107,7 @@ index a9c49a434..551a84547 100644
|
||||
this.e = i;
|
||||
this.f = enumchatformat;
|
||||
diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
|
||||
index 4fe732447..6e5d81daf 100644
|
||||
index 4fe7324475..6e5d81daf1 100644
|
||||
--- a/src/main/java/net/minecraft/server/CriterionTrigger.java
|
||||
+++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
|
||||
@@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
|
||||
@@ -119,7 +119,7 @@ index 4fe732447..6e5d81daf 100644
|
||||
return this.a;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
||||
index a5aadf285..b0a7092d6 100644
|
||||
index a5aadf2850..b0a7092d62 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
|
||||
@@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
|
||||
@@ -136,7 +136,7 @@ index a5aadf285..b0a7092d6 100644
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
||||
new file mode 100644
|
||||
index 000000000..1cbb1e67b
|
||||
index 0000000000..1cbb1e67b6
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
|
||||
@@ -0,0 +1,47 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
From ba6ccc8a8825ea4bdf169eb9ec8ff4d0a8b372a5 Mon Sep 17 00:00:00 2001
|
||||
From 7d652d8cb6a3135efa95a46d4d206d2c0eac615c Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 6 Oct 2019 12:46:35 -0500
|
||||
Subject: [PATCH] Add option to set armorstand step height
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to set armorstand step height
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
index dfe8c57ce..0f6870a45 100644
|
||||
index dfe8c57cef..0f6870a45c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
@@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
|
||||
@@ -29,7 +29,7 @@ index dfe8c57ce..0f6870a45 100644
|
||||
if (!this.canTick) {
|
||||
if (this.noTickPoseDirty) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 028a169cb..9c21d196e 100644
|
||||
index 2a5f7f96f5..4ca1f55baf 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From a715a9f0efee8196461f2e6ff34fc6cc75cdacb0 Mon Sep 17 00:00:00 2001
|
||||
From 6e3ebc4c760e75a549aae15bc9c4881d44b4ecb5 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 5 Jul 2019 16:36:55 -0500
|
||||
Subject: [PATCH] Implement ItemFactory#getMonsterEgg
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement ItemFactory#getMonsterEgg
|
||||
2 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
index 24af4c11d..8ef2c3223 100644
|
||||
index 24af4c11d6..8ef2c32236 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
|
||||
@@ -22,7 +22,7 @@ index 24af4c11d..8ef2c3223 100644
|
||||
private final int c;
|
||||
private final EntityTypes<?> d;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
index 23d775645..29161032c 100644
|
||||
index 23d7756456..29161032c3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -354,4 +354,18 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 76726919a5d08da468c119b8fbd7d57d3594aaed Mon Sep 17 00:00:00 2001
|
||||
From 0e07013d7bb8fd2ed12ccbe3bd41f3f391fe7288 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 11 Oct 2019 00:17:39 -0500
|
||||
Subject: [PATCH] Alternative Keepalive Handling
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
|
||||
3 files changed, 33 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
|
||||
index 8e93f1540..470f92c4f 100644
|
||||
index 8e93f1540b..470f92c4fb 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
|
||||
@@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
|
||||
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
|
||||
return this.a;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 2659da188..65b9b93a6 100644
|
||||
index 2659da1881..65b9b93a69 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -74,7 +74,7 @@ index 2659da188..65b9b93a6 100644
|
||||
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
|
||||
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 7be2e0181..3cd53cc3a 100644
|
||||
index 7be2e01814..3cd53cc3aa 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -159,6 +159,11 @@ public class PurpurConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From f579c8d8dda326df2e0322499c7c9b666c6330b0 Mon Sep 17 00:00:00 2001
|
||||
From c580927342086e1b3556beadfba82cf94847d2b7 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 5 Jul 2019 18:21:00 -0500
|
||||
Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
index 8ef2c3223..237fdeda5 100644
|
||||
index 8ef2c32236..237fdeda5c 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
||||
@@ -2,6 +2,11 @@ package net.minecraft.server;
|
||||
@@ -1,4 +1,4 @@
|
||||
From d3d17b117f62a2d8cbdae963403702d0767f1372 Mon Sep 17 00:00:00 2001
|
||||
From 7080c7c8b6abad38776afe90ca60d46d8138ab71 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 03:20:59 -0500
|
||||
Subject: [PATCH] Add MonsterEggSpawnEvent
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Add MonsterEggSpawnEvent
|
||||
1 file changed, 27 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
index 0dd9897b9..149e25336 100644
|
||||
index 0dd9897b99..149e253360 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
@@ -163,19 +163,45 @@ public class EntityTypes<T extends Entity> {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 458fd315ee6aec1a13dd76ae82f0520a1307c09e Mon Sep 17 00:00:00 2001
|
||||
From d2cdbe8f531dd26330edac8368e897c0a00a5b14 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 1 Feb 2020 22:22:16 -0600
|
||||
Subject: [PATCH] Add moon phase API
|
||||
@@ -1,4 +1,4 @@
|
||||
From dcf5faf511f1cdbfbbbf318a2e50cb159881aeae Mon Sep 17 00:00:00 2001
|
||||
From 242f84c6581542d3c1e3154fa399e330478405bf Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 8 Feb 2020 23:30:17 -0600
|
||||
Subject: [PATCH] Add getPlacementBlockData to World
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1600fc7ea2c8b4df257c12d795fe01445f00c6a6 Mon Sep 17 00:00:00 2001
|
||||
From 3dd56b40660f298b31d8dbeb244fb3ddcdc02448 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 23 May 2019 21:50:37 -0500
|
||||
Subject: [PATCH] Barrels have 6 rows
|
||||
@@ -11,7 +11,7 @@ Subject: [PATCH] Barrels have 6 rows
|
||||
4 files changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ContainerChest.java b/src/main/java/net/minecraft/server/ContainerChest.java
|
||||
index 0ee6524b8..7d8567b4b 100644
|
||||
index 0ee6524b89..7d8567b4b8 100644
|
||||
--- a/src/main/java/net/minecraft/server/ContainerChest.java
|
||||
+++ b/src/main/java/net/minecraft/server/ContainerChest.java
|
||||
@@ -65,6 +65,7 @@ public class ContainerChest extends Container {
|
||||
@@ -23,7 +23,7 @@ index 0ee6524b8..7d8567b4b 100644
|
||||
return new ContainerChest(Containers.GENERIC_9X6, i, playerinventory, iinventory, 6);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
|
||||
index 1e27abbea..d1a3aae91 100644
|
||||
index 1e27abbea0..d1a3aae91f 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
|
||||
@@ -54,7 +54,7 @@ public class TileEntityBarrel extends TileEntityLootable {
|
||||
@@ -53,7 +53,7 @@ index 1e27abbea..d1a3aae91 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 3cd53cc3a..f9e989d7c 100644
|
||||
index 3cd53cc3aa..f9e989d7c6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
|
||||
@@ -82,7 +82,7 @@ index 3cd53cc3a..f9e989d7c 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
index b4a7d982e..afb40a752 100644
|
||||
index b4a7d982eb..afb40a7523 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
@@ -155,6 +155,7 @@ public class CraftContainer extends Container {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5f4ecdd4733c2e1d442684f0ffe913ef2f530db4 Mon Sep 17 00:00:00 2001
|
||||
From f391234c049701f54283ba078aff28f47c67f404 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 23 Jun 2019 17:01:26 -0500
|
||||
Subject: [PATCH] Ender chests have 6 rows
|
||||
@@ -12,7 +12,7 @@ Subject: [PATCH] Ender chests have 6 rows
|
||||
5 files changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
|
||||
index 0a892a5f1..0aede130b 100644
|
||||
index 0a892a5f1a..0aede130bd 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockEnderChest.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
|
||||
@@ -48,6 +48,7 @@ public class BlockEnderChest extends BlockChestAbstract<TileEntityEnderChest> im
|
||||
@@ -24,7 +24,7 @@ index 0a892a5f1..0aede130b 100644
|
||||
}, BlockEnderChest.e));
|
||||
entityhuman.a(StatisticList.OPEN_ENDERCHEST);
|
||||
diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
|
||||
index fd31b9a6d..903c02e9e 100644
|
||||
index fd31b9a6dc..903c02e9ef 100644
|
||||
--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
|
||||
+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
|
||||
@@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
|
||||
@@ -37,7 +37,7 @@ index fd31b9a6d..903c02e9e 100644
|
||||
// CraftBukkit end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index f9e989d7c..b40dcbe94 100644
|
||||
index f9e989d7c6..b40dcbe94f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -174,14 +174,20 @@ public class PurpurConfig {
|
||||
@@ -62,7 +62,7 @@ index f9e989d7c..b40dcbe94 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
index afb40a752..7bf1e224a 100644
|
||||
index afb40a7523..7bf1e224a6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
@@ -156,6 +156,7 @@ public class CraftContainer extends Container {
|
||||
@@ -83,7 +83,7 @@ index afb40a752..7bf1e224a 100644
|
||||
case BARREL:
|
||||
delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
index 026a0c399..d2c06cff2 100644
|
||||
index 026a0c3995..d2c06cff2c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
@@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 71472017de7ffbf0967cd33fa100d722f773778a Mon Sep 17 00:00:00 2001
|
||||
From 3f47a5694c9b9f3b85c48269937b751719aac6a4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 28 Jul 2019 01:27:37 -0500
|
||||
Subject: [PATCH] Add 5 second tps average in /tps
|
||||
@@ -52,7 +52,7 @@ index 2d7f1bae7a..ec6ddbb9cf 100644
|
||||
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
|
||||
tickSection = curTime;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 7a2dfb6bc9..c4f40bb8c4 100644
|
||||
index 3c534f50b8..19f780bfa1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2055,6 +2055,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 857037c24f8711c5c4ccfc6024b6a2326463e0b8 Mon Sep 17 00:00:00 2001
|
||||
From 807e796402b30f9cdfda3fbe697760dcb23bd358 Mon Sep 17 00:00:00 2001
|
||||
From: Tom <cryptite@gmail.com>
|
||||
Date: Fri, 12 Jul 2019 07:59:35 -0500
|
||||
Subject: [PATCH] Don't recalculate permissions for players on world change
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3be3f6986099c8072b516cc265b6b2c214435e79 Mon Sep 17 00:00:00 2001
|
||||
From 8d19a33602103c19765be3862e6790ce4d1dcf91 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:25:16 -0500
|
||||
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7e4d57b8d6a58f6bd1b60e06798513b4d57d6454 Mon Sep 17 00:00:00 2001
|
||||
From 66042ed6a76b9a4d4082b70535fa8b1386fcafb4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 00:29:02 -0500
|
||||
Subject: [PATCH] Add more evoker API
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2719494ad9bcfac1e42c54b2a91c7e77a4b951b3 Mon Sep 17 00:00:00 2001
|
||||
From 6da12df0069d75ea43371cf74acc3d03b5d308f6 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Mon, 7 Oct 2019 00:15:37 -0500
|
||||
Subject: [PATCH] Add API for Villager#resetOffers()
|
||||
@@ -1,4 +1,4 @@
|
||||
From f4ae60e66d19e73e00a547ad9be607f52b53e249 Mon Sep 17 00:00:00 2001
|
||||
From b5b4e1ed6654e2aabbda223e7e0f9d820648fbc4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 18 Oct 2019 22:50:12 -0500
|
||||
Subject: [PATCH] Add more llama API
|
||||
@@ -1,4 +1,4 @@
|
||||
From 08416d8457acfd21b745a18548f1b25f9aeb122e Mon Sep 17 00:00:00 2001
|
||||
From 3f1c15c5e038c5de056b39686eabb14da3af23b5 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 03:36:52 -0500
|
||||
Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
|
||||
@@ -1,4 +1,4 @@
|
||||
From e796bf0126ceb5a4e27a7602e091f35e65fdd248 Mon Sep 17 00:00:00 2001
|
||||
From e73c2ce940a90250ce9f0d96df168b2fdb2bf67f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 23 Nov 2019 17:55:42 -0600
|
||||
Subject: [PATCH] Implement infinite lava
|
||||
@@ -70,7 +70,7 @@ index 9eba9a12c0..39252e6873 100644
|
||||
protected boolean c;
|
||||
protected boolean d;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 9c21d196ea..d9600f365c 100644
|
||||
index 4ca1f55baf..db784b373e 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 780c4da4eae4e50128e257113a390d96ab988b8c Mon Sep 17 00:00:00 2001
|
||||
From 7f87d8ae26399a946f6e30775136439581481988 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 18 Oct 2019 22:19:40 -0500
|
||||
Subject: [PATCH] Expose getItemStack for Trident
|
||||
@@ -1,4 +1,4 @@
|
||||
From d695af8c37a8a2c5f1cd321896b15ba7b780c5e2 Mon Sep 17 00:00:00 2001
|
||||
From 5f99624b03113a48dba2f464b4d85598c3a95477 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 29 Nov 2019 23:47:42 -0600
|
||||
Subject: [PATCH] Despawn egg hatches chicken
|
||||
@@ -41,7 +41,7 @@ index 2926fbb957..bbb9ca1efc 100644
|
||||
Vec3D vec3d = this.getMot();
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index d9600f365c..87ee78d69d 100644
|
||||
index db784b373e..069aa582ae 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -275,11 +275,15 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7aceb4634f8438371fc92f8ac28abaf4e1839792 Mon Sep 17 00:00:00 2001
|
||||
From ae3a69662660fcc0172a5fbdbe761c8411dbb2de Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 01:42:50 -0500
|
||||
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
|
||||
@@ -1,4 +1,4 @@
|
||||
From c679ff772308ca29a5b97e336b1cc32d4faf6fb1 Mon Sep 17 00:00:00 2001
|
||||
From 5d34c980dc6204226cedee29c99158a72f2efd59 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 30 Nov 2019 03:30:17 -0600
|
||||
Subject: [PATCH] Add sleep options
|
||||
@@ -53,7 +53,7 @@ index 9d26bd1e4c..c99a338082 100644
|
||||
return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 87ee78d69d..c023133201 100644
|
||||
index 069aa582ae..375ac07d68 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -159,6 +159,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 25de0e003f7b44527cbe13241ac8cf854f4890a0 Mon Sep 17 00:00:00 2001
|
||||
From 62c9f7ae5337e57cb2ae6d8568579136cf5d1f52 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 30 Nov 2019 01:31:09 -0600
|
||||
Subject: [PATCH] Option for hay block fall damage
|
||||
@@ -21,7 +21,7 @@ index ca81c49f0a..1f8f60542f 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index c023133201..95e8ac934a 100644
|
||||
index 375ac07d68..7bd7472467 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9e7bbf1eb4685ed52d24556905c817b4c634b29b Mon Sep 17 00:00:00 2001
|
||||
From f9772444889fa19c8064e3b1d6fc3c4fe6a5c514 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:35:35 -0500
|
||||
Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 70571eb842467eb0ab7961b91229f3007fd1d34a Mon Sep 17 00:00:00 2001
|
||||
From 4e0f5f1ffea1500a69c8f78908149446055da3bc Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:43:17 -0500
|
||||
Subject: [PATCH] Add LootableInventoryFirstFillEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 82ffb16028aa390ccb463aaf4a8ed512a225fd45 Mon Sep 17 00:00:00 2001
|
||||
From ecae5d53403dda0382ccdcffb4b565cc39442ee5 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 29 Nov 2019 22:10:12 -0600
|
||||
Subject: [PATCH] Villagers follow emerald blocks
|
||||
@@ -1,4 +1,4 @@
|
||||
From a0a239fdc10a05d943ae1ecad8ff4fe25a2fa720 Mon Sep 17 00:00:00 2001
|
||||
From 45f4aba78a244500fa677490f6706e0cbf1dbd03 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 26 Dec 2019 22:08:37 -0600
|
||||
Subject: [PATCH] Add player death exp control options
|
||||
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
|
||||
2 files changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 36582a80af..d7e00b06b8 100644
|
||||
index c99a338082..67a114d59e 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -35,7 +35,7 @@ index 36582a80af..d7e00b06b8 100644
|
||||
return 0;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 02626283b3..ff8c60000d 100644
|
||||
index e8f203d88f..4372b9a036 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -164,6 +164,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 69f480c734b5fc19bf32140a91d783fd429624a8 Mon Sep 17 00:00:00 2001
|
||||
From e5ddfc1c4c4a11c8266128d87e99e626140e1ed3 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 28 Dec 2019 04:21:54 -0600
|
||||
Subject: [PATCH] Add permission for F3+N debug
|
||||
@@ -1,4 +1,4 @@
|
||||
From e94b6686c07839a707e82c44ab4a02416afadb5a Mon Sep 17 00:00:00 2001
|
||||
From 690c0dc37144c1de3c792a3a4c96000cbe8eb834 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 3 Oct 2019 18:08:03 -0500
|
||||
Subject: [PATCH] Allow leashing villagers
|
||||
@@ -1,4 +1,4 @@
|
||||
From 46443aa8404db05925f2a7af05288ff284965286 Mon Sep 17 00:00:00 2001
|
||||
From 13bd440b57422595e594f57968c90c07dfefd723 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Mon, 22 Jul 2019 17:32:17 -0500
|
||||
Subject: [PATCH] Implement configurable search radius for villagers to spawn
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6fe11911eb836326ef2ef83a80ffbb5214f7ad57 Mon Sep 17 00:00:00 2001
|
||||
From 2a4c1cd4b01157ea9b2df3ac561f446de4298321 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 2 Jan 2020 11:31:36 -0600
|
||||
Subject: [PATCH] Make lava flow speed configurable
|
||||
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
|
||||
return this.d;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index e481e9639f..9bac4c5eb4 100644
|
||||
index d7a3c6c227..5ff002a77f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -133,8 +133,12 @@ public class PurpurWorldConfig {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8ea2d219a6e94c4eeeed28faa612bfe0a3fa8e0b Mon Sep 17 00:00:00 2001
|
||||
From d0558b753c946306a81bde3be841bfe82c939c01 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 14 Jan 2020 19:43:40 -0600
|
||||
Subject: [PATCH] Add wither skeleton takes wither damage option
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7ddc912749df96d77a45e60077b4ac8991bb55b8 Mon Sep 17 00:00:00 2001
|
||||
From 38b0e36ddd394a8854bb38913d78544f5cc8fb7e Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Wed, 22 Jan 2020 20:13:40 -0600
|
||||
Subject: [PATCH] UPnP Port Forwarding Service
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9ae921a7e3f7020c17df17a26ef302b48ddd88d6 Mon Sep 17 00:00:00 2001
|
||||
From e20eb8ddf0b9a4ad09e140047d58f843e19851e9 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 11 Feb 2020 21:56:48 -0600
|
||||
Subject: [PATCH] Implement EntityMoveEvent
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement EntityMoveEvent
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 60e2b4268c..e3dc406da5 100644
|
||||
index a42d65ed7a..a624531e58 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -17,6 +17,7 @@ import java.util.Random;
|
||||
@@ -1,4 +1,4 @@
|
||||
From ae26238039bd063633fde5b4401e0aa88c100232 Mon Sep 17 00:00:00 2001
|
||||
From c18bc5969985402025aaf08321d1d8d1a3bcc9d8 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 18 Feb 2020 20:07:08 -0600
|
||||
Subject: [PATCH] Add option to disable saving projectiles to disk
|
||||
@@ -1,4 +1,4 @@
|
||||
From e2d878a725b2fc4fbc084a07f3b9e4dae6d02822 Mon Sep 17 00:00:00 2001
|
||||
From 1efe3db5e9865ddfb881e431d612fa75ca8776b1 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] Always increment arrow despawn counter (fixes MC-125757)
|
||||
@@ -1,4 +1,4 @@
|
||||
From 861e033fe31d24e8216ec52641acee335f477f28 Mon Sep 17 00:00:00 2001
|
||||
From d0cb88bfaa8f3cf46e7d3e435784cf8422abcc35 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 22 Feb 2020 15:04:29 -0600
|
||||
Subject: [PATCH] Implement bed explosion options
|
||||
@@ -22,7 +22,7 @@ index 06a35629ab..df41a7dfcd 100644
|
||||
// CraftBukkit end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 3a530de7f9..9e16bf1431 100644
|
||||
index 1db7e5433f..fabd4f619f 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;
|
||||
@@ -1,4 +1,4 @@
|
||||
From 55263bf6667b4f528fd155ec71e9aa976df758b3 Mon Sep 17 00:00:00 2001
|
||||
From 99bcbbc8530a87863270add6659cf0621e00943c Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 22 Feb 2020 15:54:08 -0600
|
||||
Subject: [PATCH] Add item entity options
|
||||
@@ -1,4 +1,4 @@
|
||||
From 306d7b61aed9b32c3e189ddeed46aac03884e293 Mon Sep 17 00:00:00 2001
|
||||
From bea6d280e28b01d64a7591b2a52116c3e1c99ded Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 27 Feb 2020 13:39:06 -0600
|
||||
Subject: [PATCH] Make natural spawns per biome configurable
|
||||
@@ -1,4 +1,4 @@
|
||||
From f7b6a8e0feadf16e1f097f60b22ecf798baa1d05 Mon Sep 17 00:00:00 2001
|
||||
From b2c00dd988091a49b51b99e27585fb69177d57f9 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 27 Feb 2020 21:42:19 -0600
|
||||
Subject: [PATCH] Configurable void damage height
|
||||
@@ -1,4 +1,4 @@
|
||||
From 577e2b1ecdfedaf47769b1c4121007880c9774d9 Mon Sep 17 00:00:00 2001
|
||||
From 6ebe70bfb680d9c049ac629f1cb99736e3081192 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 6 Mar 2020 13:37:26 -0600
|
||||
Subject: [PATCH] Fix the dead lagging the server
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user