Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch rebuild

This commit is contained in:
md_5 2016-03-14 16:57:03 +11:00 committed by Zach Brown
parent 99277e609a
commit 7b28ee7d2b
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0010-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From 51119718d82e46e53f83f254ff0bd8f04fe3da90 Mon Sep 17 00:00:00 2001
From 46ed743dcc7133a7b9572f224f455a0aa3bb3898 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -355,10 +355,10 @@ index c226e01..d754d0d 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 821b75a..62c4877 100644
index 969840c..76cbb21 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1274,6 +1274,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1282,6 +1282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -366,7 +366,7 @@ index 821b75a..62c4877 100644
// CraftBukkit start - whole method
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1283,18 +1284,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1291,18 +1292,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -515,7 +515,7 @@ index c73f0ef..d6d4c5b 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 250a9f0..ca04f24 100644
index 2c95e76..9abcc8d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -219,10 +219,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {

6
CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,14 +1,14 @@
From 3f15c2bd09aa1930e107eb909eb51f19e2d44a28 Mon Sep 17 00:00:00 2001
From 2467f472fd780075961558c3f14cd3cde2f51dcb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6985f31..af09079 100644
index 76cbb21..7d98d67 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1276,6 +1276,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1284,6 +1284,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method

6
CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch
View File

@ -1,14 +1,14 @@
From 457934afb9df091fe09ffaea09bb104344d4ada7 Mon Sep 17 00:00:00 2001
From 4a1495e9ec2458f8e2d62580d5fdc501fa00226f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index af09079..1e5e543 100644
index 7d98d67..61bde4e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1437,6 +1437,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1445,6 +1445,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

10
CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,14 +1,14 @@
From 1983cf4f0285ec576b701c1cbc70beb1dd47d427 Mon Sep 17 00:00:00 2001
From 5a0bea3e4562f09095e7b46f6787aa903f52d3a6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1e5e543..5d70587 100644
index 61bde4e..24c2a88 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -125,6 +125,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -126,6 +126,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
private float lastPitch = Float.MAX_VALUE;
private float lastYaw = Float.MAX_VALUE;
private boolean justTeleported = false;
@ -16,7 +16,7 @@ index 1e5e543..5d70587 100644
public CraftPlayer getPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
@@ -352,6 +353,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -353,6 +354,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - fire PlayerMoveEvent
Player player = this.getPlayer();
@ -35,7 +35,7 @@ index 1e5e543..5d70587 100644
Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
@@ -377,7 +390,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -378,7 +391,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.lastPitch = to.getPitch();
// Skip the first time we do this

6
CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch
View File

@ -1,14 +1,14 @@
From 596d07ca4a9ed5b0975590981ac849eb72e57695 Mon Sep 17 00:00:00 2001
From c49550fac45c61befb2d68423285985a6884018f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5d70587..31f1bbd 100644
index 24c2a88..a107029 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1182,9 +1182,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1190,9 +1190,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
}

6
CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch
View File

@ -1,14 +1,14 @@
From b7b8bfee24d4b91a6fc4d596d270b40b13b69e68 Mon Sep 17 00:00:00 2001
From 45f4fa5d08d2d7709d73c12d3a6a89ab82e6ce04 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 31f1bbd..000b6b0 100644
index a107029..2515ee7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1944,7 +1944,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1952,7 +1952,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45;
// CraftBukkit - Add invalidItems check

8
CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch
View File

@ -1,11 +1,11 @@
From 1d2e985e16567d606ce01a7519a3294dc039a4a2 Mon Sep 17 00:00:00 2001
From 609be2ed65f9c2aed5a721299eb0250292510ea6 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f6bec63..6d3afd8 100644
index c982151..4c55974 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -258,7 +258,7 @@ public abstract class Entity implements ICommandListener {
@ -27,10 +27,10 @@ index f6bec63..6d3afd8 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 000b6b0..d2b3816 100644
index 2515ee7..2a04f15 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1105,7 +1105,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1113,7 +1113,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.resetIdleTimer();
} else {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to set an invalid carried item");

6
CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch
View File

@ -1,4 +1,4 @@
From 8bed0fb6bec952d105c3ae90c39f61d63bec5f5d Mon Sep 17 00:00:00 2001
From cacbcaae1eeabd9cd04a40d1ff7365c3b46a4407 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 14 May 2014 13:46:48 -0700
Subject: [PATCH] Process conversation input on the main thread. Fixes
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d2b3816..7d1970c 100644
index 2a04f15..fec19f1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1167,7 +1167,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1175,7 +1175,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
} else if (s.isEmpty()) {
LOGGER.warn(this.player.getName() + " tried to send an empty message");
} else if (getPlayer().isConversing()) {

8
CraftBukkit-Patches/0112-Limit-block-placement-interaction-packets.patch
View File

@ -1,4 +1,4 @@
From 5fe1142b5408130bc6bc3a47ae15ddcb32355ad3 Mon Sep 17 00:00:00 2001
From 80a3ac9101388c99787260b3617c8329199848cd Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 29 Jun 2014 21:10:34 +0100
Subject: [PATCH] Limit block placement/interaction packets
@ -41,10 +41,10 @@ index cb0356e..0000000
- }
-}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7d1970c..5217c1c 100644
index fec19f1..f354985 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -890,6 +890,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -898,6 +898,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
@ -55,7 +55,7 @@ index 7d1970c..5217c1c 100644
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.x());
if (this.player.dead) return; // CraftBukkit
@@ -898,7 +902,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -906,7 +910,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
ItemStack itemstack = this.player.b(enumhand);
this.player.resetIdleTimer();

6
CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch
View File

@ -1,4 +1,4 @@
From fba2f6ee2a40f41132372e125ec3086fa613c5fb Mon Sep 17 00:00:00 2001
From 328d5299f11ac60682ca5cadfac7db5934f94ac1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
@ -17,10 +17,10 @@ index 4c6dfb1..a9ea3f5 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5217c1c..99707f0 100644
index f354985..39ba550 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1076,7 +1076,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1084,7 +1084,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start