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

Update Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-17 20:45:59 -05:00
parent 64a0e868f2
commit 81f917a124
4 changed files with 474 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

611
patches/server/0002-Tuinity-Server-Patches.patch
View File

File diff suppressed because it is too large Load Diff

12
patches/server/0033-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From b887b068bf905cd438ade68ed492bc960ab9cc65 Mon Sep 17 00:00:00 2001 From bcb659268b65188ce411f5f4905aab0cf6e1e58e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500 Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+) 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 937e513d8..ef26e66d7 100644 index fc185136fb..24ce25ba60 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1160,6 +1160,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1162,6 +1162,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public void openSign(TileEntitySign tileentitysign) { public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this); tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index 937e513d8..ef26e66d7 100644
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7929fcc80..895e34ed3 100644 index 7929fcc800..895e34ed34 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index 7929fcc80..895e34ed3 100644
} }
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 099d98e04..19d76c8cc 100644 index 099d98e04c..19d76c8cce 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java --- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e04..19d76c8cc 100644
@Override @Override
public PacketPlayOutTileEntityData getUpdatePacket() { public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dfa631803..7395abfb6 100644 index dfa6318039..7395abfb6f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -76,8 +76,10 @@ public class PurpurWorldConfig { @@ -76,8 +76,10 @@ public class PurpurWorldConfig {

22
patches/server/0042-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 5dafe5578138aec3c228bcf45894de8c01ba1518 Mon Sep 17 00:00:00 2001 From e7e9bd131a20909782422715828c3bc79b2c430d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500 Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API Subject: [PATCH] Implement AFK API
@@ -16,7 +16,7 @@ Subject: [PATCH] Implement AFK API
9 files changed, 111 insertions(+), 24 deletions(-) 9 files changed, 111 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index de22cad76..9d26bd1e4 100644 index de22cad764..9d26bd1e4c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -36,10 +36,10 @@ index de22cad76..9d26bd1e4 100644
super(EntityTypes.PLAYER, world); super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a; this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ef26e66d7..bc1d429b1 100644 index 24ce25ba60..4694edc5de 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1651,8 +1651,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1653,8 +1653,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() { public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis(); this.cj = SystemUtils.getMonotonicMillis();
@@ -92,7 +92,7 @@ index ef26e66d7..bc1d429b1 100644
return this.serverStatisticManager; return this.serverStatisticManager;
} }
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 9622615b5..e0d011a2d 100644 index 9622615b50..e0d011a2d8 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java --- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -121,28 +121,18 @@ public interface IEntityAccess { @@ -121,28 +121,18 @@ public interface IEntityAccess {
@@ -137,7 +137,7 @@ index 9622615b5..e0d011a2d 100644
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index e1fdee279..4665671ef 100644 index e1fdee2794..4665671ef6 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java --- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -157,7 +157,7 @@ index e1fdee279..4665671ef 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) { public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3; double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 67afa457e..2659da188 100644 index 67afa457e8..2659da1881 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -279,6 +279,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -279,6 +279,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -192,7 +192,7 @@ index 67afa457e..2659da188 100644
if (from.getX() != Double.MAX_VALUE) { if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone(); Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 633d67b66..37b5a1193 100644 index d6472905a2..22a1c4ebfa 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -745,7 +745,7 @@ public class WorldServer extends World { @@ -745,7 +745,7 @@ public class WorldServer extends World {
@@ -214,7 +214,7 @@ index 633d67b66..37b5a1193 100644
} else if (entityplayer.isSleeping()) { } else if (entityplayer.isSleeping()) {
++j; ++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2bbbf30c0..95f1dcf0d 100644 index 2bbbf30c0d..95f1dcf0d7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,21 @@ public class PurpurWorldConfig { @@ -147,6 +147,21 @@ public class PurpurWorldConfig {
@@ -240,7 +240,7 @@ index 2bbbf30c0..95f1dcf0d 100644
public boolean batRidableInWater = false; public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true; 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 516a01648..7451e120c 100644 index 516a016480..7451e120cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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 { @@ -2125,4 +2125,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -266,7 +266,7 @@ index 516a01648..7451e120c 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index e160f03c1..11fb14612 100644 index e160f03c1e..11fb146129 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -142,6 +142,7 @@ public class ActivationRange @@ -142,6 +142,7 @@ public class ActivationRange

6
patches/server/0048-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From 31322d7a3ae3d5b942d637d08b7525e914a8b538 Mon Sep 17 00:00:00 2001 From b10f29e98fb9e452fa1a0df4f40176134d67f6aa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500 Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index bc1d429b1..cbc6f7d58 100644 index 4694edc5de..407730ec2d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1134,7 +1134,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1136,7 +1136,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public boolean isInvulnerable(DamageSource damagesource) { public boolean isInvulnerable(DamageSource damagesource) {