CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix patch extras

Browse Source
This commit is contained in:
md_5 2013-06-08 09:29:32 +10:00
parent bcae8ccd4a
commit 4fbc447abd
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch
View File

@ -1,4 +1,4 @@
From d82d7f2c415d2d222e1aa88a75318d6a047799a0 Mon Sep 17 00:00:00 2001 From 2981039788a5b8c88404d5ee18a2bfdfdbcdd9ac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500 Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges Subject: [PATCH] Entity Tracking Ranges
@ -24,7 +24,7 @@ index d7efe3e..f6f1ab0 100644
i = this.d; i = this.d;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 94cb855..fe7b8b0 100644 index 8d916ae..f07982d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -107,6 +107,12 @@ public class CraftWorld implements World { @@ -107,6 +107,12 @@ public class CraftWorld implements World {
@ -78,10 +78,10 @@ index 94cb855..fe7b8b0 100644
public Block getBlockAt(int x, int y, int z) { public Block getBlockAt(int x, int y, int z) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 4cbc796..2422d29 100644 index 6a164ca..c434f14 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -16,12 +16,16 @@ import net.minecraft.server.EntityComplexPart; @@ -16,11 +16,16 @@ import net.minecraft.server.EntityComplexPart;
import net.minecraft.server.EntityCreature; import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityEnderCrystal; import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon; import net.minecraft.server.EntityEnderDragon;
@ -91,14 +91,14 @@ index 4cbc796..2422d29 100644
+import net.minecraft.server.EntityGhast; +import net.minecraft.server.EntityGhast;
import net.minecraft.server.EntityHuman; import net.minecraft.server.EntityHuman;
+import net.minecraft.server.EntityItem; +import net.minecraft.server.EntityItem;
import net.minecraft.server.EntityItemFrame; +import net.minecraft.server.EntityItemFrame;
import net.minecraft.server.EntityLiving; import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityMonster; import net.minecraft.server.EntityMonster;
+import net.minecraft.server.EntityPainting; +import net.minecraft.server.EntityPainting;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityProjectile; import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntitySheep; import net.minecraft.server.EntitySheep;
@@ -371,6 +375,30 @@ public class Spigot { @@ -374,6 +379,30 @@ public class Spigot {
} }
} }

8
CraftBukkit-Patches/0032-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 4580c29449670fe30f2b72e87160ef0f630dbdc8 Mon Sep 17 00:00:00 2001 From db3159d9b6d9fbc1c40bd0fa9302473af2e73a6d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100 Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support Subject: [PATCH] BungeeCord Support
@ -59,10 +59,10 @@ index fcd4136..fb4ec7b 100644
event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage()); event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 2422d29..861cfd9 100644 index c434f14..dd92087 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -54,6 +54,7 @@ public class Spigot { @@ -55,6 +55,7 @@ public class Spigot {
private static boolean filterIps; private static boolean filterIps;
public static boolean tabPing = false; public static boolean tabPing = false;
private static Metrics metrics; private static Metrics metrics;
@ -70,7 +70,7 @@ index 2422d29..861cfd9 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -90,6 +91,7 @@ public class Spigot { @@ -91,6 +92,7 @@ public class Spigot {
} }
tabPing = configuration.getBoolean("settings.tab-ping", tabPing); tabPing = configuration.getBoolean("settings.tab-ping", tabPing);

8
CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch
View File

@ -1,4 +1,4 @@
From f27c36d6c48cfa8868841ebfcd3611605467cdb0 Mon Sep 17 00:00:00 2001 From b33ddea4d6783e043f800307afcad113312e0332 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100 Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions Subject: [PATCH] Texture Pack Resolutions
@ -19,10 +19,10 @@ index 1079d1c..96cf583 100644
public abstract boolean T(); public abstract boolean T();
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 861cfd9..9ac137a 100644 index dd92087..99020e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -55,6 +55,7 @@ public class Spigot { @@ -56,6 +56,7 @@ public class Spigot {
public static boolean tabPing = false; public static boolean tabPing = false;
private static Metrics metrics; private static Metrics metrics;
public static List<String> bungeeIPs; public static List<String> bungeeIPs;
@ -30,7 +30,7 @@ index 861cfd9..9ac137a 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -92,6 +93,7 @@ public class Spigot { @@ -93,6 +94,7 @@ public class Spigot {
tabPing = configuration.getBoolean("settings.tab-ping", tabPing); tabPing = configuration.getBoolean("settings.tab-ping", tabPing);
bungeeIPs = configuration.getStringList("settings.bungee-proxies"); bungeeIPs = configuration.getStringList("settings.bungee-proxies");

8
CraftBukkit-Patches/0037-Prevent-handshake-spam-from-invalid-names.patch
View File

@ -1,4 +1,4 @@
From 23a19cbbb1470706bd2afc5c36d854ddc06eb612 Mon Sep 17 00:00:00 2001 From 42b62f094b969198fa9c03249dcd16f45a56ddff Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com> From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Sun, 14 Apr 2013 21:19:57 +0500 Date: Sun, 14 Apr 2013 21:19:57 +0500
Subject: [PATCH] Prevent handshake spam from invalid names. Subject: [PATCH] Prevent handshake spam from invalid names.
@ -25,7 +25,7 @@ index 343af93..aa6609b 100644
public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 9ac137a..8772350 100644 index 99020e7..c7ef0e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -6,6 +6,7 @@ import java.net.InetAddress; @@ -6,6 +6,7 @@ import java.net.InetAddress;
@ -36,7 +36,7 @@ index 9ac137a..8772350 100644
import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.Chunk; import net.minecraft.server.Chunk;
import net.minecraft.server.Entity; import net.minecraft.server.Entity;
@@ -56,6 +57,7 @@ public class Spigot { @@ -57,6 +58,7 @@ public class Spigot {
private static Metrics metrics; private static Metrics metrics;
public static List<String> bungeeIPs; public static List<String> bungeeIPs;
public static int textureResolution = 16; public static int textureResolution = 16;
@ -44,7 +44,7 @@ index 9ac137a..8772350 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -380,7 +382,9 @@ public class Spigot { @@ -384,7 +386,9 @@ public class Spigot {
} }
/** /**

6
CraftBukkit-Patches/0045-Fix-Health-Scaling.patch
View File

@ -1,4 +1,4 @@
From 46010bb2eda8911ec87f0ab8faff26a98609cefd Mon Sep 17 00:00:00 2001 From 63114381d169d098a31955246c46cb665651e33b Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com> From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 14:54:11 +1000 Date: Sun, 2 Jun 2013 14:54:11 +1000
Subject: [PATCH] Fix Health Scaling Subject: [PATCH] Fix Health Scaling
@ -6,10 +6,10 @@ Subject: [PATCH] Fix Health Scaling
Fix scaled health sending incorrect values to client. No longer attempts to scale health above maximum. Hopefully fixes 'flash' when player eats food. Fix scaled health sending incorrect values to client. No longer attempts to scale health above maximum. Hopefully fixes 'flash' when player eats food.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 58a4acb..57d39fe 100644 index 35f3fea..ae9415c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -416,7 +416,10 @@ public abstract class EntityLiving extends Entity { @@ -423,7 +423,10 @@ public abstract class EntityLiving extends Entity {
public int getScaledHealth() { public int getScaledHealth() {
if (this.maxHealth != this.getMaxHealth() && this.getHealth() > 0) { if (this.maxHealth != this.getMaxHealth() && this.getHealth() > 0) {

8
CraftBukkit-Patches/0049-Hopper-Cooldowns.patch
View File

@ -1,4 +1,4 @@
From 44a54f1f7c3bb73fe9237125a84225324d627570 Mon Sep 17 00:00:00 2001 From 586597e0ad25279f6e81b1e5e710d9e8f8a76f82 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de> From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000 Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns Subject: [PATCH] Hopper Cooldowns
@ -64,10 +64,10 @@ index f6d269d..88b2cb0 100644
iinventory.update(); iinventory.update();
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 8772350..9b9e9fe 100644 index c7ef0e1..bbfcd97 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -58,6 +58,8 @@ public class Spigot { @@ -59,6 +59,8 @@ public class Spigot {
public static List<String> bungeeIPs; public static List<String> bungeeIPs;
public static int textureResolution = 16; public static int textureResolution = 16;
public static final Pattern validName = Pattern.compile("^[a-zA-Z0-9_-]{2,16}$"); public static final Pattern validName = Pattern.compile("^[a-zA-Z0-9_-]{2,16}$");
@ -76,7 +76,7 @@ index 8772350..9b9e9fe 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps")); commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -96,6 +98,8 @@ public class Spigot { @@ -97,6 +99,8 @@ public class Spigot {
tabPing = configuration.getBoolean("settings.tab-ping", tabPing); tabPing = configuration.getBoolean("settings.tab-ping", tabPing);
bungeeIPs = configuration.getStringList("settings.bungee-proxies"); bungeeIPs = configuration.getStringList("settings.bungee-proxies");
textureResolution = configuration.getInt("settings.texture-resolution", textureResolution); textureResolution = configuration.getInt("settings.texture-resolution", textureResolution);