SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Rebuild patches.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2016-03-03 17:04:36 +11:00 committet von Zach Brown
Ursprung 216dd304c5
Commit 7fe3d4c009
11 geänderte Dateien mit 44 neuen und 44 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

22
CraftBukkit-Patches/0010-Spigot-Timings.patch
Datei anzeigen

@ -1,4 +1,4 @@
From b2f4b09f228385ad00401dcd5cbbc0ed058340bf Mon Sep 17 00:00:00 2001
From c3a5cd66a0f950ba650db985addaed64f5f9674b 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
@ -26,10 +26,10 @@ index 582e684..8345e87 100644
public BlockPosition f(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 38b9d16..8f3cd56 100644
index 01729cb..780919a 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -148,6 +148,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -149,6 +149,7 @@ public class ChunkProviderServer implements IChunkProvider {
// CraftBukkit end
if (chunk == null) {
@ -37,7 +37,7 @@ index 38b9d16..8f3cd56 100644
long k = ChunkCoordIntPair.a(i, j);
chunk = this.loadChunk(i, j);
@@ -196,6 +197,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -197,6 +198,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
// CraftBukkit end
chunk.loadNearby(this, this.chunkGenerator);
@ -96,7 +96,7 @@ index 003aee0..53b5296 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 9a38cca..1361b06 100644
index 9c17951..db78855 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -22,6 +22,7 @@ import java.io.PrintStream;
@ -115,7 +115,7 @@ index 9a38cca..1361b06 100644
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
@@ -407,6 +409,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -408,6 +410,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
// CraftBukkit end
}
@ -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 d3539e1..a8dff8b 100644
index ecfda38..00c3935 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1234,6 +1234,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1245,6 +1245,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -366,7 +366,7 @@ index d3539e1..a8dff8b 100644
// CraftBukkit start - whole method
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1243,18 +1244,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1254,18 +1255,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -515,7 +515,7 @@ index c5c7503..11e8de4 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 59b78bb..f8a2195 100644
index 250a9f0..8678daa 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 {
@ -585,7 +585,7 @@ index 91965c0..261b423 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index eedf49b..2b6928f 100644
index 9947f9c..83d228a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -252,7 +252,9 @@ public class CraftWorld implements World {

6
CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
Datei anzeigen

@ -1,14 +1,14 @@
From e8472d0d5873dad6c8bf1e32c5c30962523bdf28 Mon Sep 17 00:00:00 2001
From 715a24423ba7d183831905661704c153508c145f 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 a125127..785372f 100644
index 00c3935..37f4f61 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1236,6 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1247,6 +1247,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
Datei anzeigen

@ -1,14 +1,14 @@
From 7cbd31d918c0c0fe968f41c1bde0c971694f7ac6 Mon Sep 17 00:00:00 2001
From 39437cd95727777ddf5c643787fd6b2f5e7f2eae 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 785372f..57d74b1 100644
index 37f4f61..08fce5a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1397,6 +1397,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1408,6 +1408,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);

8
CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 4af1d6f24291acf1ec980e735d957b24a6d4c978 Mon Sep 17 00:00:00 2001
From d84fad458d80f1cae8913ac4f0356868df9a6344 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -24,10 +24,10 @@ index 47ef0db..277a6ad 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 8f3cd56..fd3f457 100644
index 780919a..21e7709 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -257,7 +257,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -258,7 +258,7 @@ public class ChunkProviderServer implements IChunkProvider {
this.saveChunk(chunk);
chunk.f(false);
++i;
@ -60,7 +60,7 @@ index dfe3305..bd2837c 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 84b6e41..2063185 100644
index 29f6cff..c63f4d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -732,12 +732,17 @@ public class CraftWorld implements World {

6
CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch
Datei anzeigen

@ -1,14 +1,14 @@
From e40f3f6833f52da858a3b9592681eac68298d92e Mon Sep 17 00:00:00 2001
From b3ab9526848e2fbfe4fabc325f4316a9387bb08e 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 e2b215c..859ddf0 100644
index c5c2c16..04daae2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1142,9 +1142,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1153,9 +1153,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
}

6
CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 20d67b6173f1cc8238c953b1cf510dbb4255b4a6 Mon Sep 17 00:00:00 2001
From 2dcc782d369e8b597ec2366802a455743751745c 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 0596a2e..7698e6d 100644
index 04daae2..5f7c715 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1904,7 +1904,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1915,7 +1915,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
Datei anzeigen

@ -1,11 +1,11 @@
From c3f64231ce40efc2de10b80e0126efaa5cde4f26 Mon Sep 17 00:00:00 2001
From 329169a39de1e5654ae7394ec400f9c1f553f8f0 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 5702cb0..a4a6352 100644
index a3f6503..3aa0d7c 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 5702cb0..a4a6352 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c52eeae..461f0ea 100644
index 5f7c715..c5f8aba 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1065,7 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1076,7 +1076,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/0087-Add-Conversion-Message.patch
Datei anzeigen

@ -1,14 +1,14 @@
From cf66da81fbf35eb187b836bec00bd5cde3c0968c Mon Sep 17 00:00:00 2001
From 4061f5031a14d656a89a50143c95057cc7eff15e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 23:30:44 +1000
Subject: [PATCH] Add Conversion Message
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 6b560b0..8a8e05b 100644
index 7a788d9..cf55b4d 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -561,6 +561,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -562,6 +562,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
protected boolean aO() {

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

@ -1,4 +1,4 @@
From 35ecabbc407286cfb38ae49e37b4429c357fa0f0 Mon Sep 17 00:00:00 2001
From 325e20b825e6ac268d9bc3ab6ea42509dd2fe2b0 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 461f0ea..e7c6f1e 100644
index c5f8aba..abd736c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1127,7 +1127,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1138,7 +1138,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
Datei anzeigen

@ -1,4 +1,4 @@
From ee0cfdc769fd155ab0a7d925021cb918ab2b2e0a Mon Sep 17 00:00:00 2001
From f3f751d4a46d8fe8f3da352eac1b24e3cea935a5 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 e7c6f1e..b06597a 100644
index abd736c..74ef06e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -850,6 +850,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -861,6 +861,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
@ -55,7 +55,7 @@ index e7c6f1e..b06597a 100644
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.x());
if (this.player.dead) return; // CraftBukkit
@@ -858,7 +862,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -869,7 +873,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
Datei anzeigen

@ -1,4 +1,4 @@
From 514d88656c3a313f8f51770cd3e8bfc172d35059 Mon Sep 17 00:00:00 2001
From 1ae491877466da7bcc0f10a0e11ed146f778db22 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 b06597a..0f873ae 100644
index 74ef06e..83befa9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1036,7 +1036,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1047,7 +1047,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start