Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Rebuild patches.

Browse Source
This commit is contained in:
md_5 2016-03-04 15:26:28 +11:00 committed by Zach Brown
parent 23aa9afb3c
commit 2298695b41
12 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From d717ec80e25786019b396d00fb62f8cabf37844f Mon Sep 17 00:00:00 2001
From 75bae478c72d0bb8d5394543a622b11f89604f45 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 ecfda38..00c3935 100644
index 49b8d3a..face946 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1245,6 +1245,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1246,6 +1246,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -366,7 +366,7 @@ index ecfda38..00c3935 100644
// CraftBukkit start - whole method
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1254,18 +1255,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1255,18 +1256,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {

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

@ -1,14 +1,14 @@
From 715a24423ba7d183831905661704c153508c145f Mon Sep 17 00:00:00 2001
From c635ff2ab88bf4514d7ec372970b866f578e833f 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 00c3935..37f4f61 100644
index face946..d07269e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1247,6 +1247,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1248,6 +1248,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 39437cd95727777ddf5c643787fd6b2f5e7f2eae Mon Sep 17 00:00:00 2001
From c28c72646f1b1d468735a3800ec1825057e45584 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 37f4f61..08fce5a 100644
index d07269e..0f96a20 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1408,6 +1408,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1409,6 +1409,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 43b248af5680128ce1b8cdaf1afb938a41a14b92 Mon Sep 17 00:00:00 2001
From 6b7a7a6b1dc6e05c2b53899a4cca7e0b9f45c682 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 57d74b1..e2b215c 100644
index 0f96a20..dda3d8c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -124,6 +124,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -125,6 +125,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 57d74b1..e2b215c 100644
public CraftPlayer getPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
@@ -324,6 +325,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -325,6 +326,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - fire PlayerMoveEvent
Player player = this.getPlayer();
@ -35,7 +35,7 @@ index 57d74b1..e2b215c 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.
@@ -349,7 +362,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -350,7 +363,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 b3ab9526848e2fbfe4fabc325f4316a9387bb08e Mon Sep 17 00:00:00 2001
From 61b8a01d655a795144a25e103d5448cd9fae18d7 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 c5c2c16..04daae2 100644
index dda3d8c..cf16eae 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1153,9 +1153,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1154,9 +1154,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 2dcc782d369e8b597ec2366802a455743751745c Mon Sep 17 00:00:00 2001
From 3095e84c29d79ffca16bad832fc9920260045f76 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 04daae2..5f7c715 100644
index cf16eae..117c972 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1915,7 +1915,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1916,7 +1916,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45;
// CraftBukkit - Add invalidItems check

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

@ -1,4 +1,4 @@
From 329169a39de1e5654ae7394ec400f9c1f553f8f0 Mon Sep 17 00:00:00 2001
From 60ea6c076ba0abc29b8f8ad9e19b834cf1643fac 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!
@ -27,10 +27,10 @@ index a3f6503..3aa0d7c 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5f7c715..c5f8aba 100644
index 117c972..a82c6dd 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 {
@@ -1077,7 +1077,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 325e20b825e6ac268d9bc3ab6ea42509dd2fe2b0 Mon Sep 17 00:00:00 2001
From 4d40c00814e487c4df73e43710a365b045e97595 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 c5f8aba..abd736c 100644
index a82c6dd..e263764 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1138,7 +1138,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1139,7 +1139,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()) {

16
CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
View File

@ -1,23 +1,23 @@
From 130bdfbe5d26dffdaf367a0a587aa3ac1be103b5 Mon Sep 17 00:00:00 2001
From 5c3328985bd5f3963514df632ad65dc08dcdd704 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Jun 2014 23:42:52 +0100
Subject: [PATCH] Add damager to the unhandled error
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index f9ab062..1946c05 100644
index 131792b..5083875 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -184,7 +184,7 @@ public class CraftEventFactory {
@@ -185,7 +185,7 @@ public class CraftEventFactory {
*/
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack, EnumHand hand) {
if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
- throw new AssertionError(String.format("%s performing %s with %s", who, action, itemstack));
+ throw new IllegalArgumentException(String.format("%s performing %s with %s", who, action, itemstack)); // Spigot
}
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack, hand);
}
@@ -482,7 +482,7 @@ public class CraftEventFactory {
@@ -483,7 +483,7 @@ public class CraftEventFactory {
if (source == DamageSource.CACTUS) {
cause = DamageCause.CONTACT;
} else {
@ -26,7 +26,7 @@ index f9ab062..1946c05 100644
}
EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) {
@@ -502,7 +502,7 @@ public class CraftEventFactory {
@@ -503,7 +503,7 @@ public class CraftEventFactory {
} else if (source == DamageSource.DRAGON_BREATH) {
cause = DamageCause.DRAGON_BREATH;
} else {
@ -35,7 +35,7 @@ index f9ab062..1946c05 100644
}
EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) {
@@ -542,7 +542,7 @@ public class CraftEventFactory {
@@ -543,7 +543,7 @@ public class CraftEventFactory {
return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
}

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

@ -1,4 +1,4 @@
From f3f751d4a46d8fe8f3da352eac1b24e3cea935a5 Mon Sep 17 00:00:00 2001
From 76b567282192c8c32c0d05050d3c410d28888e98 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 abd736c..74ef06e 100644
index e263764..9e9dfb2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -861,6 +861,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -862,6 +862,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
@ -55,7 +55,7 @@ index abd736c..74ef06e 100644
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.x());
if (this.player.dead) return; // CraftBukkit
@@ -869,7 +873,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -870,7 +874,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 1ae491877466da7bcc0f10a0e11ed146f778db22 Mon Sep 17 00:00:00 2001
From 3cb25e3086787fcf55e23d5bc8239e2aafdcbf98 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 74ef06e..83befa9 100644
index 9e9dfb2..e711f75 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1047,7 +1047,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1048,7 +1048,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start

6
CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 6a48229227e8d21ce020e18f5a2622a3a68724df Mon Sep 17 00:00:00 2001
From 071fbaa33adc4fca64ef162952ad4f5eccfb1a10 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -19,10 +19,10 @@ index efe792b..a7903a2 100644
ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
world.triggerEffect(2004, blockposition, 0);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 1946c05..ed4ce69 100644
index 5083875..c9ff812 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -983,4 +983,19 @@ public class CraftEventFactory {
@@ -984,4 +984,19 @@ public class CraftEventFactory {
event.getInventory().setItem(2, event.getResult());
return event;
}