Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
[CI-SKIP] Remove Waving banner fix (#4786)
Mojang fixed it in MC-63720
Dieser Commit ist enthalten in:
Ursprung
82792f883f
Commit
7ae47d4eb3
@ -1,35 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Gabscap <git@gabscap.de>
|
||||
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 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..15af5927f3d1d41b2a4f86b4267aa6a0485fb53e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
|
||||
@@ -4,7 +4,13 @@ import java.io.IOException;
|
||||
|
||||
public class PacketPlayOutUpdateTime implements Packet<PacketListenerPlayOut> {
|
||||
|
||||
+ // 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() {}
|
||||
@@ -19,6 +25,9 @@ public class PacketPlayOutUpdateTime implements Packet<PacketListenerPlayOut> {
|
||||
}
|
||||
}
|
||||
|
||||
+ // Paper start
|
||||
+ this.a = this.a % 192000;
|
||||
+ // Paper end
|
||||
}
|
||||
|
||||
@Override
|
@ -22,7 +22,7 @@ index 4c956da69261d3092cd9abb1b98f7c9a220cc91e..6998ec2d7550094498649deb90289887
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index e307f939745db9688e96c42a70d337e8751874f2..2dfecbc93c5de9ea67064ff2b8e041e173fc0be2 100644
|
||||
index 01fde964fa2fae3cfefc4b9e8e2c59a997d09539..51afd8277d1b00e299c44d198faa64179940a8ec 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -479,7 +479,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@ -66,7 +66,7 @@ index 92785a80bae6b5c88285536f74f23e0609d793ac..19f0149051d9ff58223624754b27285c
|
||||
this.getServer().getPluginManager().callEvent(event);
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 2dfecbc93c5de9ea67064ff2b8e041e173fc0be2..e900ce242a84c8f6003905cf320070ea88ae13f3 100644
|
||||
index 51afd8277d1b00e299c44d198faa64179940a8ec..058d222b97c2698518f165f5a5b59fb2aed565fa 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -87,6 +87,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
@ -5,7 +5,7 @@ Subject: [PATCH] Fix reducedDebugInfo not initialized on client
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 7c6e35590f4217ec68ddfc3e189b847eb48b1c20..7f76582918ce1ad48eb0feb9679cf2e2172f02db 100644
|
||||
index 3b7c4c611e8936faef09f3bec80f96037e45d77d..8d12df108d32819f5dc87a8ee5e9578a900a0e93 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -174,6 +174,7 @@ public abstract class PlayerList {
|
@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
|
||||
SPIGOT-1915 & GH-114
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 9d10107169b5439c725b8450fab0b0d0dd96423e..c0ee227689c0865ecc4816ea534047aeb2b82c12 100644
|
||||
index a8b0bfe18c88ff14fa285cbf2f0da7713f20d0cc..8f352763d81bb44786a603e80feb3a25ce91eb7a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -792,6 +792,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@ -57,7 +57,7 @@ index d1581c9d9838797eb425020d21bd0fba432e5652..99dc43159f240135957aee35f6129f19
|
||||
packetdataserializer.a(this.c);
|
||||
packetdataserializer.a(this.d);
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 7f76582918ce1ad48eb0feb9679cf2e2172f02db..0287576bf59128583454ca2f60ca05cb978a36d9 100644
|
||||
index 8d12df108d32819f5dc87a8ee5e9578a900a0e93..234a6e73122c68358029ce2d578d82ab92ad5b45 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -75,6 +75,7 @@ public abstract class PlayerList {
|
@ -29,7 +29,7 @@ index a91c4facac9cc1b7c2e497be77af636ac2b36138..bc85a155a6ca0e21ca1dcf737c015e99
|
||||
this.locale = packetplayinsettings.locale;
|
||||
this.clientViewDistance = packetplayinsettings.viewDistance;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index c0ee227689c0865ecc4816ea534047aeb2b82c12..ba145b9a6e7cc82a1f9ee46db96487ab7a09a724 100644
|
||||
index 8f352763d81bb44786a603e80feb3a25ce91eb7a..f447059d0eecf68c44a74f27acd726f9355c4bd7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1816,8 +1816,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@ -18,7 +18,7 @@ index bdfd17362518ff2398cf9e1743a7a4f0c7a0e966..cc14e4b4609fa7013df666181c0e02a5
|
||||
|
||||
public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> a() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index ba145b9a6e7cc82a1f9ee46db96487ab7a09a724..0101eccae2d7f55104c8ff1c38778db944e0c0aa 100644
|
||||
index f447059d0eecf68c44a74f27acd726f9355c4bd7..023bcc56e8c27d9660dadd90e074f64b75159d25 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -244,6 +244,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
|
||||
the same way we handle async chunk loads.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 0287576bf59128583454ca2f60ca05cb978a36d9..4c787974629ce2d39317c7c36036b7e22b0dc35f 100644
|
||||
index 234a6e73122c68358029ce2d578d82ab92ad5b45..b517099929ee2575f5cdb2661520c2f60ba72304 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -975,11 +975,13 @@ public abstract class PlayerList {
|
@ -73,7 +73,7 @@ index 365719e9f6228f19dfb598d4850dc7ef69377f7c..836fdfcedb6b878c69bfa22cbbe1fc10
|
||||
// Spigot Start
|
||||
private static double calcTps(double avg, double exp, double tps)
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 4c787974629ce2d39317c7c36036b7e22b0dc35f..6375d1061859ea9fa0faef93a92b90d4b38d5903 100644
|
||||
index b517099929ee2575f5cdb2661520c2f60ba72304..e42a789f24215f192427218fa08ae327f09c2a46 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1086,10 +1086,15 @@ public abstract class PlayerList {
|
@ -245,7 +245,7 @@ index 836fdfcedb6b878c69bfa22cbbe1fc10a25d8ad0..b14381fd33b19a511106046d0c66d583
|
||||
|
||||
public KeyPair getKeyPair() {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 6375d1061859ea9fa0faef93a92b90d4b38d5903..11ecafedb839454bfac009dec5d41ed45b08c1d4 100644
|
||||
index e42a789f24215f192427218fa08ae327f09c2a46..6b12c1d96a2b0ea305425a563dd0e908c611db89 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -79,8 +79,7 @@ public abstract class PlayerList {
|
@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 11ecafedb839454bfac009dec5d41ed45b08c1d4..3fa1ea2958bec57d40b702bdbdc511d67b165d7e 100644
|
||||
index 6b12c1d96a2b0ea305425a563dd0e908c611db89..02479d398189f0956a6e2a8882f398e33853873e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -543,9 +543,9 @@ public abstract class PlayerList {
|
Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren