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

Fix conflicts to update to latest Bukkit, yay fluff.

Browse Source
This commit is contained in:
md_5 2013-01-20 14:52:20 +11:00
parent efa13af283
commit b31a31a6a8
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch
View File

@ -1,4 +1,4 @@
From d4bc3f13ea5fe1d471c3c6873e04280b91ef90d2 Mon Sep 17 00:00:00 2001 From 0cac70d6eea0e2fb6a1b222d569cd3b464d9de23 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sun, 30 Dec 2012 23:56:05 -0600 Date: Sun, 30 Dec 2012 23:56:05 -0600
Subject: [PATCH] Spigot Changes. This commit has undergone basic testing and Subject: [PATCH] Spigot Changes. This commit has undergone basic testing and
@ -404,10 +404,10 @@ index b8b6d52..a7baa0f 100644
if (!this.world.isStatic && this.age >= 6000) { if (!this.world.isStatic && this.age >= 6000) {
// CraftBukkit start // CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 99f1218..b28b364 100644 index 8d61ca6..3aed58f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -48,6 +48,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -49,6 +49,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newTotalExp = 0; public int newTotalExp = 0;
public boolean keepLevel = false; public boolean keepLevel = false;
// CraftBukkit end // CraftBukkit end
@ -543,10 +543,10 @@ index 4bdf8aa..4ee2b8b 100644
dedicatedserver.primaryThread.start(); dedicatedserver.primaryThread.start();
// Runtime.getRuntime().addShutdownHook(new ThreadShutdown(dedicatedserver)); // Runtime.getRuntime().addShutdownHook(new ThreadShutdown(dedicatedserver));
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 94b62ac..80656b2 100644 index fac9ea5..43a24f5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -851,8 +851,19 @@ public class PlayerConnection extends Connection { @@ -852,8 +852,19 @@ public class PlayerConnection extends Connection {
this.chat(s, packet3chat.a_()); this.chat(s, packet3chat.a_());
@ -567,7 +567,7 @@ index 94b62ac..80656b2 100644
// CraftBukkit start // CraftBukkit start
if (packet3chat.a_()) { if (packet3chat.a_()) {
Waitable waitable = new Waitable() { Waitable waitable = new Waitable() {
@@ -975,7 +986,7 @@ public class PlayerConnection extends Connection { @@ -976,7 +987,7 @@ public class PlayerConnection extends Connection {
} }
try { try {
@ -576,7 +576,7 @@ index 94b62ac..80656b2 100644
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) { if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
return; return;
} }
@@ -1371,8 +1382,9 @@ public class PlayerConnection extends Connection { @@ -1353,8 +1364,9 @@ public class PlayerConnection extends Connection {
flag = false; flag = false;
} else { } else {
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) { for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
@ -588,10 +588,10 @@ index 94b62ac..80656b2 100644
} }
} }
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 04ee0de..f165843 100644 index 2fb83cf..ced8cf0 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -250,7 +250,7 @@ public abstract class PlayerList { @@ -253,7 +253,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1); event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) { } else if (!this.isWhitelisted(s)) {
@ -600,7 +600,7 @@ index 04ee0de..f165843 100644
} else { } else {
String s2 = socketaddress.toString(); String s2 = socketaddress.toString();
@@ -822,7 +822,13 @@ public abstract class PlayerList { @@ -901,7 +901,13 @@ public abstract class PlayerList {
public void r() { public void r() {
while (!this.players.isEmpty()) { while (!this.players.isEmpty()) {
@ -1052,7 +1052,7 @@ index e2fd0df..263cbd3 100644
public List a(Class oclass, AxisAlignedBB axisalignedbb) { public List a(Class oclass, AxisAlignedBB axisalignedbb) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b426d5d..6de6b12 100644 index 3f73ef9..6764bef 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@

8
CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
View File

@ -1,4 +1,4 @@
From d256fe9354a28a332756ec67b8204b146afded8f Mon Sep 17 00:00:00 2001 From 748657f2ca08bb10cdd55a063cd78cf0ab51fc4a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100 Date: Sun, 23 Dec 2012 17:09:40 +1100
Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
@ -10,7 +10,7 @@ Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 8566391..0b0c351 100644 index 7afa68e..c6f8ff9 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -4,10 +4,12 @@ import java.util.Iterator; @@ -4,10 +4,12 @@ import java.util.Iterator;
@ -18,15 +18,15 @@ index 8566391..0b0c351 100644
// CraftBukkit start // CraftBukkit start
+import org.bukkit.Bukkit; +import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.entity.CraftItem; import org.bukkit.craftbukkit.entity.CraftItem;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerBedLeaveEvent; import org.bukkit.event.player.PlayerBedLeaveEvent;
import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerDropItemEvent;
@@ -882,6 +884,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen @@ -883,6 +885,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
super.die(); super.die();
this.defaultContainer.b(this); this.defaultContainer.b(this);
if (this.activeContainer != null) { if (this.activeContainer != null) {

6
CraftBukkit-Patches/0017-Skip-entity.move-if-we-are-not-moving-anywhere.patch
View File

@ -1,4 +1,4 @@
From a1d4528a15bca1309e3d9ff10a465508ce910cce Mon Sep 17 00:00:00 2001 From f783c54e66aff8a835da46d1849af4d2157e8818 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 19 Jan 2013 01:11:30 -0500 Date: Sat, 19 Jan 2013 01:11:30 -0500
Subject: [PATCH] Skip entity.move() if we are not moving anywhere. Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
@ -8,10 +8,10 @@ Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ebe0ed0..b816334 100644 index e1d611e..83f7ae8 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -419,6 +419,7 @@ public abstract class Entity { @@ -423,6 +423,7 @@ public abstract class Entity {
} }
public void move(double d0, double d1, double d2) { public void move(double d0, double d1, double d2) {

12
CraftBukkit-Patches/0019-Add-Custom-Timings-to-various-points.patch
View File

@ -1,4 +1,4 @@
From ef52fe6ba0830854af641e8e9355fc0a16f94c73 Mon Sep 17 00:00:00 2001 From 2af2697578d73f9965a4578afe80aa49a0cd30ab Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Add Custom Timings to various points Subject: [PATCH] Add Custom Timings to various points
@ -158,7 +158,7 @@ index 7d2e633..b2481aa 100644
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 80656b2..9cdadf1 100644 index 43a24f5..7ca0acf 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -25,6 +25,7 @@ import org.bukkit.craftbukkit.util.Waitable; @@ -25,6 +25,7 @@ import org.bukkit.craftbukkit.util.Waitable;
@ -169,7 +169,7 @@ index 80656b2..9cdadf1 100644
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.block.SignChangeEvent;
@@ -67,6 +68,7 @@ public class PlayerConnection extends Connection { @@ -68,6 +69,7 @@ public class PlayerConnection extends Connection {
private double q; private double q;
public boolean checkMovement = true; // CraftBukkit - private -> public public boolean checkMovement = true; // CraftBukkit - private -> public
private IntHashMap s = new IntHashMap(); private IntHashMap s = new IntHashMap();
@ -177,7 +177,7 @@ index 80656b2..9cdadf1 100644
public PlayerConnection(MinecraftServer minecraftserver, INetworkManager inetworkmanager, EntityPlayer entityplayer) { public PlayerConnection(MinecraftServer minecraftserver, INetworkManager inetworkmanager, EntityPlayer entityplayer) {
this.minecraftServer = minecraftserver; this.minecraftServer = minecraftserver;
@@ -975,6 +977,7 @@ public class PlayerConnection extends Connection { @@ -976,6 +978,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end // CraftBukkit end
private void handleCommand(String s) { private void handleCommand(String s) {
@ -185,7 +185,7 @@ index 80656b2..9cdadf1 100644
// CraftBukkit start // CraftBukkit start
CraftPlayer player = this.getPlayer(); CraftPlayer player = this.getPlayer();
@@ -982,19 +985,23 @@ public class PlayerConnection extends Connection { @@ -983,19 +986,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event); this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
@ -274,7 +274,7 @@ index e28aa00..3c6adb6 100644
this.methodProfiler.b(); this.methodProfiler.b();
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6e5434b..fdb3fc7 100644 index faa56ac..b7ab326 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -157,9 +157,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -157,9 +157,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate

2
rebuildPatches.sh
View File

@ -16,7 +16,7 @@ function savePatches {
what=$1 what=$1
target=$2 target=$2
cd $basedir/$target/ cd $basedir/$target/
git format-patch -N -o $basedir/${what}-Patches/ upstream/master git format-patch -N -o $basedir/${what}-Patches/ upstream/upstream
cd $basedir cd $basedir
git add $basedir/${what}-Patches git add $basedir/${what}-Patches
cleanupPatches $basedir/${what}-Patches cleanupPatches $basedir/${what}-Patches