Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-13 15:38:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix shade fix accidentally being unmerged

Browse Source
This commit is contained in:
md_5 2013-12-04 19:57:08 +11:00
parent f538d02596
commit e770480d4b
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 88d2db45ea440c18444cadaed4ec125857d9a0fd Mon Sep 17 00:00:00 2001
From 1e89a50213c51e7ee007a928876031c590a84e59 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 2afdff4..a77fec8 100644
index 2afdff4..fb6b5c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@ -137,7 +137,7 @@ index 2afdff4..a77fec8 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
+ <version>2.0</version>
+ <version>2.1</version>
<executions>
<execution>
<phase>package</phase>

6
CraftBukkit-Patches/0015-Highly-Optimized-Tick-Loop.patch
View File

@ -1,11 +1,11 @@
From 9b65fde8e1bbddb11b5e9a8faa5528e4dca6e9c1 Mon Sep 17 00:00:00 2001
From 80b6402b3418bbaa834f68b7fc852bd3d81908a0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 12:28:17 +1100
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cdc41b4..1a9df71 100644
index c1c4aa0..5db21fd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -101,6 +101,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -21,7 +21,7 @@ index cdc41b4..1a9df71 100644
public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet
i = this;
@@ -412,45 +418,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -418,45 +424,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void run() {
try {
if (this.init()) {

20
CraftBukkit-Patches/0016-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From 8f225ceffcca2c68b7c74e1fbce53a2263257422 Mon Sep 17 00:00:00 2001
From adcf9b66485a16ca0d14efd12230771086c06a90 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -64,7 +64,7 @@ index fec07f8..0c1350e 100644
protected String H() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b48df95..57f0280 100644
index 5db21fd..9543509 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
@ -83,7 +83,7 @@ index b48df95..57f0280 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -432,7 +432,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -438,7 +438,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@ -94,7 +94,7 @@ index b48df95..57f0280 100644
}
// Spigot end
} else {
@@ -557,6 +560,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -563,6 +566,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void u() {
this.methodProfiler.a("levels");
@ -102,7 +102,7 @@ index b48df95..57f0280 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -565,7 +569,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -571,7 +575,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@ -113,7 +113,7 @@ index b48df95..57f0280 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -617,7 +624,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -623,7 +630,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -123,7 +123,7 @@ index b48df95..57f0280 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -626,14 +635,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -632,14 +641,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");
@ -145,10 +145,10 @@ index b48df95..57f0280 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 53e70c4..7a76f16 100644
index aa6d8d8..cf5fb7e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -908,6 +908,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -910,6 +910,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit end
private void handleCommand(String s) {
@ -156,7 +156,7 @@ index 53e70c4..7a76f16 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -915,19 +916,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -917,19 +918,23 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {

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

@ -1,14 +1,14 @@
From 999f4f59ebf6954c554a7d432a7b41cba79efef2 Mon Sep 17 00:00:00 2001
From 3a11fb5f840dedcf08ea38c90debb9db7f737ad8 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 4e41695..8a5e257 100644
index cf5fb7e..8e80ab5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -921,7 +921,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -923,7 +923,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {

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

@ -1,14 +1,14 @@
From f19bd92ec29bbbc009855d7f5eb756f09859c0f7 Mon Sep 17 00:00:00 2001
From 762df1aafc439cfc917c64c2d24dd564c1373fea 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 8a5e257..2e04e71 100644
index 8e80ab5..e35e7a8 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1028,6 +1028,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1030,6 +1030,13 @@ public class PlayerConnection implements PacketPlayInListener {
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

6
CraftBukkit-Patches/0052-Fully-Disable-Snooper-When-Not-Required.patch
View File

@ -1,14 +1,14 @@
From 13a38c0eeaeabf094b4fd33c908a8e1eb393bad6 Mon Sep 17 00:00:00 2001
From 91d9abc6d16c1700571dcbb1b633503c595aa95e Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5a07791..2ab8366 100644
index 9543509..6b5e092 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -545,11 +545,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -551,11 +551,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.f[this.ticks % 100] = System.nanoTime() - i;
this.methodProfiler.b();
this.methodProfiler.a("snooper");

8
CraftBukkit-Patches/0060-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,11 +1,11 @@
From 0ff1de8b8b24b90e91471202ae5a9e129f672ceb Mon Sep 17 00:00:00 2001
From da2c4dcf1043656220387aef2485bce94d41cbf1 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 2e04e71..5c86849 100644
index e35e7a8..5534bc3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -102,6 +102,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -16,7 +16,7 @@ index 2e04e71..5c86849 100644
// For the PacketPlayOutBlockPlace hack :(
Long lastPacket;
@@ -218,7 +219,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -219,7 +220,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.lastPitch = to.getPitch();
// Skip the first time we do this
@ -25,7 +25,7 @@ index 2e04e71..5c86849 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
@@ -242,7 +243,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -243,7 +244,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.justTeleported = false;
return;
}

8
CraftBukkit-Patches/0064-Watchdog-Thread.patch
View File

@ -1,14 +1,14 @@
From 4b2f953fb85e7a393219a1615b3b9c2bcb6fa870 Mon Sep 17 00:00:00 2001
From cba82a2fe027a66e917bc7c25e1eea965bc65295 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2ab8366..831707c 100644
index 6b5e092..170cdef 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -436,6 +436,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -442,6 +442,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.t();
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
@ -16,7 +16,7 @@ index 2ab8366..831707c 100644
}
// Spigot end
} else {
@@ -462,6 +463,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -468,6 +469,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {