Skip to content

Commit

Permalink
Update Paper
Browse files Browse the repository at this point in the history
  • Loading branch information
@Techcable
Techcable committed May 14, 2018
1 parent 8014601 commit b23f17e
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Paper
Submodule Paper updated 177 files
20 changes: 10 additions & 10 deletions Paper-API-Patches/0003-Better-version-checking.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fb34623611573361412b6705637b15f49b29b8a0 Mon Sep 17 00:00:00 2001
From a6e285cb74b857ff3824c0ca15c54395f9ff5755 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 24 Apr 2017 11:07:19 -0700
Subject: [PATCH] Better version checking
Expand Down Expand Up @@ -250,7 +250,7 @@ index 00000000..d68c6e0e
+ }
+}
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index aae605e9..bb970b3c 100644
index c45faf4c..bfb4ef63 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -20,6 +20,7 @@ import java.io.IOException;
Expand All @@ -261,9 +261,9 @@ index aae605e9..bb970b3c 100644
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
@@ -32,6 +33,12 @@ import org.json.simple.parser.ParseException;
import java.io.InputStreamReader;
@@ -33,6 +34,12 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import com.destroystokyo.paper.VersionHistoryManager;
// Paper end
+// TacoSpigot start
+import net.techcable.tacospigot.TacoVersioning;
Expand All @@ -274,7 +274,7 @@ index aae605e9..bb970b3c 100644

public class VersionCommand extends BukkitCommand {
public VersionCommand(String name) {
@@ -187,6 +194,24 @@ public class VersionCommand extends BukkitCommand {
@@ -205,6 +212,24 @@ public class VersionCommand extends BukkitCommand {
}
}

Expand All @@ -299,7 +299,7 @@ index aae605e9..bb970b3c 100644
// Paper start
private void obtainVersion() {
String version = Bukkit.getVersion();
@@ -224,6 +249,9 @@ public class VersionCommand extends BukkitCommand {
@@ -242,6 +267,9 @@ public class VersionCommand extends BukkitCommand {
setVersionMessage("Unknown version, custom build?");
}
}
Expand All @@ -309,7 +309,7 @@ index aae605e9..bb970b3c 100644

private void setVersionMessage(String msg) {
lastCheck = System.currentTimeMillis();
@@ -241,6 +269,8 @@ public class VersionCommand extends BukkitCommand {
@@ -259,6 +287,8 @@ public class VersionCommand extends BukkitCommand {
}
}

Expand All @@ -318,21 +318,21 @@ index aae605e9..bb970b3c 100644
// Paper start
private static int getDistance(String repo, String verInfo) {
try {
@@ -264,7 +294,6 @@ public class VersionCommand extends BukkitCommand {
@@ -282,7 +312,6 @@ public class VersionCommand extends BukkitCommand {
} finally {
reader.close();
}
- */
}

private static int getFromJenkins(int currentVer) {
@@ -318,4 +347,6 @@ public class VersionCommand extends BukkitCommand {
@@ -336,4 +365,6 @@ public class VersionCommand extends BukkitCommand {
}
}
// Paper end
+ */
+ // TacoSpigot end
}
--
2.12.2
2.17.0

8 changes: 4 additions & 4 deletions Paper-Server-Patches/0003-Show-TacoSpigot-in-client-crashes-server-lists-and-M.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 6d37c43d13744f4ef71353cfa243394c7936cc46 Mon Sep 17 00:00:00 2001
From 0b230c5a588e9eacd80009cd8ff7c3b01bffc54a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sat, 7 Mar 2015 22:55:25 -0600
Subject: [PATCH] Show 'TacoSpigot' in client crashes, server lists, and Mojang
stats


diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e8c72db9..c3a395e9 100644
index f82e22b2..9bfb4d7d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1148,7 +1148,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -1149,7 +1149,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}

public String getServerModName() {
Expand All @@ -19,5 +19,5 @@ index e8c72db9..c3a395e9 100644

public CrashReport b(CrashReport crashreport) {
--
2.16.2
2.17.0

12 changes: 6 additions & 6 deletions Paper-Server-Patches/0004-TacoSpigot-configuration-files.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1c0054d71f36cf78a0642ef509d776dba1544f26 Mon Sep 17 00:00:00 2001
From 272f3ba5e22196674af2c47f63f931de44d73d48 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 26 Jul 2015 16:50:26 -0700
Subject: [PATCH] TacoSpigot configuration files
Expand Down Expand Up @@ -207,26 +207,26 @@ index 00000000..2bc58772
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 090a4d2f..5456046c 100644
index 80702f6f..434dfff8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -735,6 +735,7 @@ public final class CraftServer implements Server {
@@ -743,6 +743,7 @@ public final class CraftServer implements Server {

org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
+ net.techcable.tacospigot.TacoSpigotConfig.init((File) console.options.valueOf("taco-settings")); // TacoSpigot
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -751,6 +752,7 @@ public final class CraftServer implements Server {
@@ -759,6 +760,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
+ world.tacoSpigotConfig.init(); // TacoSpigot
}

Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1419,7 +1421,7 @@ public final class CraftServer implements Server {
@@ -1447,7 +1449,7 @@ public final class CraftServer implements Server {

for (JsonListEntry entry : playerList.getProfileBans().getValues()) {
result.add(getOfflinePlayer((GameProfile) entry.getKey()));
Expand Down Expand Up @@ -263,5 +263,5 @@ index 21628e19..9f27e129 100644
MinecraftServer.main(options);
} catch (Throwable t) {
--
2.16.2
2.17.0

8 changes: 4 additions & 4 deletions Paper-Server-Patches/0009-Fix-incorrect-getNoDamageTicks.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 6c228d84bc52f4ab8edb214ea15a525205cb937f Mon Sep 17 00:00:00 2001
From cecadb70b41a3005bdeba8613a8070d2451a9b41 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Wed, 16 Mar 2016 22:03:58 -0400
Subject: [PATCH] Fix incorrect getNoDamageTicks


diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 21631c58..38109c83 100644
index fd47065c..195d2880 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1420,11 +1420,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1453,11 +1453,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

@Override
public int getNoDamageTicks() {
Expand All @@ -26,5 +26,5 @@ index 21631c58..38109c83 100644

@Override
--
2.16.2
2.17.0

10 changes: 5 additions & 5 deletions Paper-Server-Patches/0010-Use-client-ticks-to-make-attack-speed-more-accurate.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From bc2fcdbe7c9cf7190508f5d5aebc7f7d4720b785 Mon Sep 17 00:00:00 2001
From abbdcf27311db1f9d2ff46cb3f611f267be3ca48 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 19 Apr 2016 20:30:55 -0400
Subject: [PATCH] Use client ticks to make attack speed more accurate


diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 34723705..c0511583 100644
index 0b51903e..5f4b81dd 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -22,6 +22,8 @@ import org.bukkit.event.player.PlayerVelocityEvent;
Expand All @@ -27,7 +27,7 @@ index 34723705..c0511583 100644
public boolean affectsSpawning = true;

// CraftBukkit start
@@ -1935,11 +1940,25 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1939,11 +1944,25 @@ public abstract class EntityHuman extends EntityLiving {
}

public float n(float f) {
Expand Down Expand Up @@ -55,7 +55,7 @@ index 34723705..c0511583 100644

public ItemCooldown getCooldownTracker() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3fbf51e5..60b692fc 100644
index a5faa6a0..2ec63775 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -510,6 +510,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
Expand All @@ -82,5 +82,5 @@ index b7699d8c..22c6009a 100644
+ }
}
--
2.16.2
2.17.0

1 comment on commit b23f17e

@sgdc3
Copy link

@sgdc3 sgdc3 commented on b23f17e May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its-been-84-years-18525167

Please sign in to comment.