From 59916983880616c838f1d9cffbd4936b68c695b6 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Thu, 19 Nov 2020 16:15:16 +0100 Subject: [PATCH] [CI-SKIP] Remove Waving banner fix (#4786) Mojang fixed it in MC-63720 --- ...support.patch => 0547-Brand-support.patch} | 0 ...support.patch => 0557-Brand-support.patch} | 0 .../Waving-banner-workaround.patch | 35 ------------------- 3 files changed, 35 deletions(-) rename Spigot-Server-Patches/{0548-Brand-support.patch => 0547-Brand-support.patch} (100%) rename Spigot-Server-Patches/{0558-Brand-support.patch => 0557-Brand-support.patch} (100%) delete mode 100644 Spigot-Server-Patches/Waving-banner-workaround.patch diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0547-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0548-Brand-support.patch rename to Spigot-Server-Patches/0547-Brand-support.patch diff --git a/Spigot-Server-Patches/0558-Brand-support.patch b/Spigot-Server-Patches/0557-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0558-Brand-support.patch rename to Spigot-Server-Patches/0557-Brand-support.patch diff --git a/Spigot-Server-Patches/Waving-banner-workaround.patch b/Spigot-Server-Patches/Waving-banner-workaround.patch deleted file mode 100644 index 1015539413..0000000000 --- a/Spigot-Server-Patches/Waving-banner-workaround.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gabscap -Date: Sat, 19 Mar 2016 22:25:11 +0100 -Subject: [PATCH] Waving banner workaround - -This patch is a workaround for MC-63720 - -diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -+++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -@@ -0,0 +0,0 @@ import java.io.IOException; - - public class PacketPlayOutUpdateTime implements Packet { - -+ // World Age in ticks -+ // Not changed by server commands -+ // World Age must not be negative - private long a; -+ // Time of Day in ticks -+ // If negative the sun will stop moving at the Math.abs of the time -+ // Displayed in the debug screen (F3) - private long b; - - public PacketPlayOutUpdateTime() {} -@@ -0,0 +0,0 @@ public class PacketPlayOutUpdateTime implements Packet { - } - } - -+ // Paper start -+ this.a = this.a % 192000; -+ // Paper end - } - - @Override