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

Upstream merge, nothing major.

This commit is contained in:
md_5 2013-12-21 19:13:39 +11:00
parent ed2fd14801
commit 1c099a713b
13 changed files with 39 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 80a81d2605fad9113a648523420a62afd5996a4d
Subproject commit 1227b64c8af479322a440de24431c7dc057c9655

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

@ -1,11 +1,11 @@
From e1577d7f4aa7a223ab9203f5adf601402694f23d Mon Sep 17 00:00:00 2001
From 9d67cba92758aa8257d0d9dedfd2d98bb231ca8f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 2a947f6..0bc95a2 100644
index 6c07c03..efb3262 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@ -23,7 +23,7 @@ index 2a947f6..0bc95a2 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.7.2-R0.2-SNAPSHOT</version>
<version>1.7.2-R0.3-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>

2
CraftBukkit

@ -1 +1 @@
Subproject commit d791c11a97e761a9f2bdfc9609be83e3922ae0ce
Subproject commit bafd45061f6e0f7a140defbfaec9850df04fde66

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

@ -1,11 +1,11 @@
From 1c3e7c82ffcf88db8257648b299b791ad87a697b Mon Sep 17 00:00:00 2001
From da0ad65b3037c143034e4f7786e011564e79ccd5 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 f81e47a..a4051a1 100644
index 2f06c8e..bec994f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@ -25,7 +25,7 @@ index f81e47a..a4051a1 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.7.2-R0.2-SNAPSHOT</version>
<version>1.7.2-R0.3-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -142,7 +142,7 @@ index f81e47a..a4051a1 100644
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 362b507..15a5a5d 100644
index 2653710..61455c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -224,7 +224,7 @@ public final class CraftServer implements Server {

287
CraftBukkit-Patches/0002-mc-dev-imports.patch
View File

@ -1,294 +1,9 @@
From 3151c58c5dcbd427ced326aff814638419a2cb7b Mon Sep 17 00:00:00 2001
From f30364ebd6fa3727e726f45f9776364089ce76b2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
diff --git a/src/main/java/net/minecraft/server/BiomeDecorator.java b/src/main/java/net/minecraft/server/BiomeDecorator.java
new file mode 100644
index 0000000..b048d6c
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BiomeDecorator.java
@@ -0,0 +1,279 @@
+package net.minecraft.server;
+
+import java.util.Random;
+
+public class BiomeDecorator {
+
+ protected World a;
+ protected Random b;
+ protected int c;
+ protected int d;
+ protected WorldGenerator e = new WorldGenClay(4);
+ protected WorldGenerator f;
+ protected WorldGenerator g;
+ protected WorldGenerator h;
+ protected WorldGenerator i;
+ protected WorldGenerator j;
+ protected WorldGenerator k;
+ protected WorldGenerator l;
+ protected WorldGenerator m;
+ protected WorldGenerator n;
+ protected WorldGenerator o;
+ protected WorldGenFlowers p;
+ protected WorldGenerator q;
+ protected WorldGenerator r;
+ protected WorldGenerator s;
+ protected WorldGenerator t;
+ protected WorldGenerator u;
+ protected WorldGenerator v;
+ protected int w;
+ protected int x;
+ protected int y;
+ protected int z;
+ protected int A;
+ protected int B;
+ protected int C;
+ protected int D;
+ protected int E;
+ protected int F;
+ protected int G;
+ protected int H;
+ public boolean I;
+
+ public BiomeDecorator() {
+ this.f = new WorldGenSand(Blocks.SAND, 7);
+ this.g = new WorldGenSand(Blocks.GRAVEL, 6);
+ this.h = new WorldGenMinable(Blocks.DIRT, 32);
+ this.i = new WorldGenMinable(Blocks.GRAVEL, 32);
+ this.j = new WorldGenMinable(Blocks.COAL_ORE, 16);
+ this.k = new WorldGenMinable(Blocks.IRON_ORE, 8);
+ this.l = new WorldGenMinable(Blocks.GOLD_ORE, 8);
+ this.m = new WorldGenMinable(Blocks.REDSTONE_ORE, 7);
+ this.n = new WorldGenMinable(Blocks.DIAMOND_ORE, 7);
+ this.o = new WorldGenMinable(Blocks.LAPIS_ORE, 6);
+ this.p = new WorldGenFlowers(Blocks.YELLOW_FLOWER);
+ this.q = new WorldGenFlowers(Blocks.BROWN_MUSHROOM);
+ this.r = new WorldGenFlowers(Blocks.RED_MUSHROOM);
+ this.s = new WorldGenHugeMushroom();
+ this.t = new WorldGenReed();
+ this.u = new WorldGenCactus();
+ this.v = new WorldGenWaterLily();
+ this.y = 2;
+ this.z = 1;
+ this.E = 1;
+ this.F = 3;
+ this.G = 1;
+ this.I = true;
+ }
+
+ public void a(World world, Random random, BiomeBase biomebase, int i, int j) {
+ if (this.a != null) {
+ throw new RuntimeException("Already decorating!!");
+ } else {
+ this.a = world;
+ this.b = random;
+ this.c = i;
+ this.d = j;
+ this.a(biomebase);
+ this.a = null;
+ this.b = null;
+ }
+ }
+
+ protected void a(BiomeBase biomebase) {
+ this.a();
+
+ int i;
+ int j;
+ int k;
+
+ for (i = 0; i < this.F; ++i) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ this.f.a(this.a, this.b, j, this.a.i(j, k), k);
+ }
+
+ for (i = 0; i < this.G; ++i) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ this.e.a(this.a, this.b, j, this.a.i(j, k), k);
+ }
+
+ for (i = 0; i < this.E; ++i) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ this.g.a(this.a, this.b, j, this.a.i(j, k), k);
+ }
+
+ i = this.x;
+ if (this.b.nextInt(10) == 0) {
+ ++i;
+ }
+
+ int l;
+ int i1;
+
+ for (j = 0; j < i; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.a.getHighestBlockYAt(k, l);
+ WorldGenTreeAbstract worldgentreeabstract = biomebase.a(this.b);
+
+ worldgentreeabstract.a(1.0D, 1.0D, 1.0D);
+ if (worldgentreeabstract.a(this.a, this.b, k, i1, l)) {
+ worldgentreeabstract.b(this.a, this.b, k, i1, l);
+ }
+ }
+
+ for (j = 0; j < this.H; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ this.s.a(this.a, this.b, k, this.a.getHighestBlockYAt(k, l), l);
+ }
+
+ for (j = 0; j < this.y; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) + 32);
+ String s = biomebase.a(this.b, k, i1, l);
+ BlockFlowers blockflowers = BlockFlowers.e(s);
+
+ if (blockflowers.getMaterial() != Material.AIR) {
+ this.p.a(blockflowers, BlockFlowers.f(s));
+ this.p.a(this.a, this.b, k, i1, l);
+ }
+ }
+
+ for (j = 0; j < this.z; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ WorldGenerator worldgenerator = biomebase.b(this.b);
+
+ worldgenerator.a(this.a, this.b, k, i1, l);
+ }
+
+ for (j = 0; j < this.A; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ (new WorldGenDeadBush(Blocks.DEAD_BUSH)).a(this.a, this.b, k, i1, l);
+ }
+
+ for (j = 0; j < this.w; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+
+ for (i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2); i1 > 0 && this.a.isEmpty(k, i1 - 1, l); --i1) {
+ ;
+ }
+
+ this.v.a(this.a, this.b, k, i1, l);
+ }
+
+ for (j = 0; j < this.B; ++j) {
+ if (this.b.nextInt(4) == 0) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.a.getHighestBlockYAt(k, l);
+ this.q.a(this.a, this.b, k, i1, l);
+ }
+
+ if (this.b.nextInt(8) == 0) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ this.r.a(this.a, this.b, k, i1, l);
+ }
+ }
+
+ if (this.b.nextInt(4) == 0) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
+ this.q.a(this.a, this.b, j, l, k);
+ }
+
+ if (this.b.nextInt(8) == 0) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
+ this.r.a(this.a, this.b, j, l, k);
+ }
+
+ for (j = 0; j < this.C; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ this.t.a(this.a, this.b, k, i1, l);
+ }
+
+ for (j = 0; j < 10; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ this.t.a(this.a, this.b, k, i1, l);
+ }
+
+ if (this.b.nextInt(32) == 0) {
+ j = this.c + this.b.nextInt(16) + 8;
+ k = this.d + this.b.nextInt(16) + 8;
+ l = this.b.nextInt(this.a.getHighestBlockYAt(j, k) * 2);
+ (new WorldGenPumpkin()).a(this.a, this.b, j, l, k);
+ }
+
+ for (j = 0; j < this.D; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.d + this.b.nextInt(16) + 8;
+ i1 = this.b.nextInt(this.a.getHighestBlockYAt(k, l) * 2);
+ this.u.a(this.a, this.b, k, i1, l);
+ }
+
+ if (this.I) {
+ for (j = 0; j < 50; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.b.nextInt(this.b.nextInt(248) + 8);
+ i1 = this.d + this.b.nextInt(16) + 8;
+ (new WorldGenLiquids(Blocks.WATER)).a(this.a, this.b, k, l, i1);
+ }
+
+ for (j = 0; j < 20; ++j) {
+ k = this.c + this.b.nextInt(16) + 8;
+ l = this.b.nextInt(this.b.nextInt(this.b.nextInt(240) + 8) + 8);
+ i1 = this.d + this.b.nextInt(16) + 8;
+ (new WorldGenLiquids(Blocks.LAVA)).a(this.a, this.b, k, l, i1);
+ }
+ }
+ }
+
+ protected void a(int i, WorldGenerator worldgenerator, int j, int k) {
+ for (int l = 0; l < i; ++l) {
+ int i1 = this.c + this.b.nextInt(16);
+ int j1 = this.b.nextInt(k - j) + j;
+ int k1 = this.d + this.b.nextInt(16);
+
+ worldgenerator.a(this.a, this.b, i1, j1, k1);
+ }
+ }
+
+ protected void b(int i, WorldGenerator worldgenerator, int j, int k) {
+ for (int l = 0; l < i; ++l) {
+ int i1 = this.c + this.b.nextInt(16);
+ int j1 = this.b.nextInt(k) + this.b.nextInt(k) + (j - k);
+ int k1 = this.d + this.b.nextInt(16);
+
+ worldgenerator.a(this.a, this.b, i1, j1, k1);
+ }
+ }
+
+ protected void a() {
+ this.a(20, this.h, 0, 256);
+ this.a(10, this.i, 0, 256);
+ this.a(20, this.j, 0, 128);
+ this.a(20, this.k, 0, 64);
+ this.a(2, this.l, 0, 32);
+ this.a(8, this.m, 0, 16);
+ this.a(1, this.n, 0, 16);
+ this.b(1, this.o, 16, 16);
+ }
+}
diff --git a/src/main/java/net/minecraft/server/BlockBrewingStand.java b/src/main/java/net/minecraft/server/BlockBrewingStand.java
new file mode 100644
index 0000000..3287d77

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

@ -1,4 +1,4 @@
From 7afd251cfd6c1348e94d6ee6fbd649dace08c51b Mon Sep 17 00:00:00 2001
From a8b402c382f45af96c4cb9be1c4679f8275ce338 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 dc0abc5..3d6aeff 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 ce2aaf4..453e508 100644
index 0966b4b..d740620 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;
@ -145,10 +145,10 @@ index ce2aaf4..453e508 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 e3bd043..9cab7a9 100644
index 29335ea..d0ea17a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -917,6 +917,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit end
private void handleCommand(String s) {
@ -156,7 +156,7 @@ index e3bd043..9cab7a9 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -921,19 +922,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -924,19 +925,23 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {

6
CraftBukkit-Patches/0036-Do-Not-Search-for-Offline-Players.patch
View File

@ -1,4 +1,4 @@
From 14d76502e1a0bb93291be25cc0ae0b415504b76d Mon Sep 17 00:00:00 2001
From bdd39983c171f385d1df7048105b9685b49d27f5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 13c1bbe..11f018b 100644
index 0ab3255..6a38465 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1131,7 +1131,7 @@ public final class CraftServer implements Server {
@@ -1133,7 +1133,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {

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

@ -1,14 +1,14 @@
From 89d72a512578e8c152d804e8b39c55436ea48d57 Mon Sep 17 00:00:00 2001
From 8cfeba1ddf246c3db3ed85cb7c2115c6c1417c02 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 d34fea7..df988f1 100644
index d0ea17a..31be464 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -927,7 +927,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -930,7 +930,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {

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

@ -1,14 +1,14 @@
From 13be8ff0ff998aff7a3e9d2502ae61cd82e7a8b1 Mon Sep 17 00:00:00 2001
From e11e68c3e8cc31ae9a98bf793fe1da82646c37ae Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 11f018b..04939af 100644
index 6a38465..4d77259 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1396,6 +1396,13 @@ public final class CraftServer implements Server {
@@ -1398,6 +1398,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {

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

@ -1,14 +1,14 @@
From 5d046da9dcfbe18c17127c4b32b1f27c1ba6c536 Mon Sep 17 00:00:00 2001
From 5412db4240e439381eca27ff3cf47c2c961e587b 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 df988f1..21462c5 100644
index 31be464..6e54ad1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1044,6 +1044,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1047,6 +1047,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);

10
CraftBukkit-Patches/0058-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,14 +1,14 @@
From 9012deaaf0fe945dba34bbcdc8f720d76aa89c94 Mon Sep 17 00:00:00 2001
From 093e002fed03cfc3e4b51441d197a4467eca5d39 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 c38d48a..ff91fd3 100644
index 6e54ad1..e88adfa 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -103,6 +103,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -105,6 +105,7 @@ public class PlayerConnection implements PacketPlayInListener {
private float lastPitch = Float.MAX_VALUE;
private float lastYaw = Float.MAX_VALUE;
private boolean justTeleported = false;
@ -16,7 +16,7 @@ index c38d48a..ff91fd3 100644
// For the PacketPlayOutBlockPlace hack :(
Long lastPacket;
@@ -220,7 +221,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -222,7 +223,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.lastPitch = to.getPitch();
// Skip the first time we do this
@ -25,7 +25,7 @@ index c38d48a..ff91fd3 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
@@ -244,7 +245,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -246,7 +247,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.justTeleported = false;
return;
}

6
CraftBukkit-Patches/0069-Remove-OS-X-Special-Chars-from-Signs.patch
View File

@ -1,14 +1,14 @@
From f9142cbe339c21f75f232d8aa2515e384d75a5bc Mon Sep 17 00:00:00 2001
From ad5cf11f5529307cc933d4e2b6dda2fd65863b97 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f2053de..34fcdc2 100644
index e88adfa..1903362 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1562,6 +1562,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;

8
CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
View File

@ -1,4 +1,4 @@
From 74545d3df2c4499287022b01b051bb88d953e041 Mon Sep 17 00:00:00 2001
From b889d097a6084e131b56d547b18d3e2f64d89fd8 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:32:15 +1100
Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@ -32,7 +32,7 @@ index e63f17c..e58be15 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cfa90d3..f369944 100644
index 5cd6f7d..232a604 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -546,6 +546,12 @@ public final class CraftServer implements Server {
@ -48,7 +48,7 @@ index cfa90d3..f369944 100644
sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
@@ -1399,15 +1405,23 @@ public final class CraftServer implements Server {
@@ -1401,15 +1407,23 @@ public final class CraftServer implements Server {
}
// Spigot End
@ -310,5 +310,5 @@ index 0000000..a6c76cc
+ }
+}
--
1.8.4.msysgit.0
1.8.3.2