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

Update to latest CraftBukkit - is this more patches without credit I see?

Browse Source
This commit is contained in:
md_5 2013-07-03 08:27:18 +10:00
parent 5031836091
commit 54195222b9
31 changed files with 55 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From cdf6442419406734ad1c32aed74db7fcdfb45707 Mon Sep 17 00:00:00 2001
From 641e8a34d01845e770f07b08fe316c6ad5951f49 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 96d291d..4c845ca 100644
index 3a8154a..d8e9e8d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -86,6 +86,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@ -21,7 +21,7 @@ index 96d291d..4c845ca 100644
public MinecraftServer(OptionSet options) { // CraftBukkit - signature file -> OptionSet
this.c = Proxy.NO_PROXY;
@@ -390,39 +396,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -389,39 +395,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void run() {
try {
if (this.init()) {

16
CraftBukkit-Patches/0017-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From 8e9980113578df46425be034722ead177a8e5722 Mon Sep 17 00:00:00 2001
From 52574dc6475c15ac44314e9913500b2f8eaa2d02 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
@ -26,7 +26,7 @@ index b73f69c..17934c0 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3953bc4..72c6e66 100644
index 06f85fd..fd62164 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@ -63,7 +63,7 @@ index 3953bc4..72c6e66 100644
protected void C() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4c845ca..f114444 100644
index d8e9e8d..994b260 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -7,7 +7,6 @@ import java.security.KeyPair;
@ -82,7 +82,7 @@ index 4c845ca..f114444 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -410,7 +410,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -409,7 +409,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@ -93,7 +93,7 @@ index 4c845ca..f114444 100644
}
// Spigot end
} else {
@@ -509,6 +512,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -508,6 +511,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void t() {
this.methodProfiler.a("levels");
@ -101,7 +101,7 @@ index 4c845ca..f114444 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -517,7 +521,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -516,7 +520,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@ -112,7 +112,7 @@ index 4c845ca..f114444 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -569,7 +576,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -568,7 +575,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -122,7 +122,7 @@ index 4c845ca..f114444 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -578,14 +587,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -577,14 +586,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");

10
CraftBukkit-Patches/0021-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From 07f7942a349c3594957ec2d3028362ee1a07ad1f Mon Sep 17 00:00:00 2001
From 0d4073efa46306a7f80b9707cf0592201ecb6d95 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 72c6e66..e438df5 100644
index fd62164..46eb430 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -88,7 +88,7 @@ public abstract class Entity {
@ -100,12 +100,12 @@ index affeca6..f44f5e2 100644
public int shake;
public Entity shooter;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0d9ba82..b7246fc 100644
index 0adbfcd..a01106c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -79,6 +79,13 @@ public abstract class EntityLiving extends Entity {
@@ -77,6 +77,13 @@ public abstract class EntityLiving extends Entity {
public int expToDrop;
public int maxAirTicks = 300;
public float maxHealth;
// CraftBukkit end
+ // Spigot start
+ public void inactiveTick()

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

@ -1,14 +1,14 @@
From ff71078f488cce72dd54bec2ac18c9ca848d0bae Mon Sep 17 00:00:00 2001
From 1e1f355a1446897adccd3b9a8e360651ec465d27 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 f114444..399db47 100644
index 994b260..c59b793 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -414,6 +414,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -413,6 +413,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.s();
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
@ -16,7 +16,7 @@ index f114444..399db47 100644
}
// Spigot end
} else {
@@ -441,6 +442,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -440,6 +441,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {

6
CraftBukkit-Patches/0024-Netty.patch
View File

@ -1,4 +1,4 @@
From c7dcfe3292e4fc14382023f592b5f7876df76062 Mon Sep 17 00:00:00 2001
From 9355ba52dfd738877a6f4e8fd4105318edc3978c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
@ -95,7 +95,7 @@ index c60abf1..e1b259b 100644
+ public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
}
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 252cea7..d07973d 100644
index 043321d..8b66470 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -16,7 +16,7 @@ public class PendingConnection extends Connection {
@ -133,7 +133,7 @@ index 252cea7..d07973d 100644
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
@@ -172,9 +177,18 @@ public class PendingConnection extends Connection {
@@ -175,9 +180,18 @@ public class PendingConnection extends Connection {
this.networkManager.queue(new Packet255KickDisconnect(s));
this.networkManager.d();

6
CraftBukkit-Patches/0029-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 8c072aae86a7dbaf86b3bbf86da59e9d36ac9d82 Mon Sep 17 00:00:00 2001
From 9851a70c8386c432d36d0ddc9a8c4851b969f92d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
- Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index d07973d..b5c305b 100644
index 8b66470..d26b4d2 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -227,4 +227,17 @@ public class PendingConnection extends Connection {
@@ -230,4 +230,17 @@ public class PendingConnection extends Connection {
static boolean a(PendingConnection pendingconnection, boolean flag) {
return pendingconnection.h = flag;
}

6
CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
View File

@ -1,14 +1,14 @@
From 95f2f96ba844d9b954a46eeb68bb113f31df6618 Mon Sep 17 00:00:00 2001
From 74ae97b613d7b51502d26a3c99a5d70c4f6e9faa Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved Ping Sending
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 094da96..8d7a59a 100644
index 69a7679..4d1bb53 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -52,6 +52,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newLevel = 0;
public int newTotalExp = 0;
public boolean keepLevel = false;

54
CraftBukkit-Patches/0038-Fix-Health-Scaling.patch
View File

@ -1,54 +0,0 @@
From 6871003c6b983808a871055b7d89bb4edd073c37 Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 14:54:11 +1000
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.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f043040..e0bb0a5 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -251,7 +251,10 @@ public abstract class EntityLiving extends Entity {
public float getScaledHealth() {
if (this.maxHealth != this.getMaxHealth() && this.getHealth() > 0) {
- return this.getHealth() * this.getMaxHealth() / this.maxHealth + 1;
+ // Spigot start
+ int health = (int) ((((double) this.getHealth()) / this.maxHealth) * this.getMaxHealth());
+ return health > 0 ? health : 1;
+ // Spigot end
} else {
return this.getHealth();
}
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
index 543a430..fcf359b 100644
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -39,7 +39,8 @@ public class FoodMetaData {
this.foodLevel = event.getFoodLevel();
}
- ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(entityhuman.getHealth(), this.foodLevel, this.saturationLevel));
+ // Spigot - This next line fixes health scaling
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(((EntityPlayer) entityhuman).getScaledHealth(), this.foodLevel, this.saturationLevel));
// CraftBukkit end
}
}
diff --git a/src/main/java/net/minecraft/server/ItemFood.java b/src/main/java/net/minecraft/server/ItemFood.java
index 5b77fc7..56eab3f 100644
--- a/src/main/java/net/minecraft/server/ItemFood.java
+++ b/src/main/java/net/minecraft/server/ItemFood.java
@@ -36,7 +36,8 @@ public class ItemFood extends Item {
entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, this.getSaturationModifier());
}
- ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(entityhuman.getHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
+ // Spigot - this next line fixes health scaling
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(((EntityPlayer) entityhuman).getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
// CraftBukkit end
entityhuman.getFoodData().a(this);
--
1.8.1.2

2
CraftBukkit-Patches/0039-Implement-Arrow-API.patch → CraftBukkit-Patches/0038-Implement-Arrow-API.patch
View File

@ -1,4 +1,4 @@
From a3dc1b3c56a6e4f4155eae074da8cc73e0ac2e8b Mon Sep 17 00:00:00 2001
From 686eb38566b0d99009bcd56b67bede1dfaeb79aa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API

2
CraftBukkit-Patches/0040-Particle-API.patch → CraftBukkit-Patches/0039-Particle-API.patch
View File

@ -1,4 +1,4 @@
From bdbd448daa26790c5048164db3836c5b7c41dd47 Mon Sep 17 00:00:00 2001
From 91ae782ce9d2bfc7192d65c7684156322c8d8aaa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API

2
CraftBukkit-Patches/0041-Hopper-Cooldowns.patch → CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
View File

@ -1,4 +1,4 @@
From bc75a12a18b4514da4bf4cfaec2b84c829b14424 Mon Sep 17 00:00:00 2001
From c70d7806cbb40ac4522b732fdaeb0fe9900e4d40 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns

2
CraftBukkit-Patches/0042-Prevent-Shutdown-Hang.patch → CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
View File

@ -1,4 +1,4 @@
From 07bb5bdbe904c1f4a54ed228fc70256fc978fe8c Mon Sep 17 00:00:00 2001
From f9c17cfa3500f63131897bacdd70ea977b4ec4c2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang

2
CraftBukkit-Patches/0043-Implement-SpawnerSpawnEvent.patch → CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From bdb1eaf9986059412f3420f66640c82ee0cafe64 Mon Sep 17 00:00:00 2001
From 25354754dfc2c8202c215a36d405e088eccf8e12 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.

2
CraftBukkit-Patches/0044-Firework-Meta-Crash-Fix.patch → CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
View File

@ -1,4 +1,4 @@
From b9eb03828e1046d342871ac2b9d45040e064a37f Mon Sep 17 00:00:00 2001
From 7df30e79258a916a9d421d385cd5f7f186428d50 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix

2
CraftBukkit-Patches/0045-Do-Not-Search-for-Offline-Players.patch → CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
View File

@ -1,4 +1,4 @@
From 31877f07ae2a21b331dd4a0dcd79a55c13943b22 Mon Sep 17 00:00:00 2001
From d7e7843516ef6d7256ec3ff874e3ede7c16922b3 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

2
CraftBukkit-Patches/0046-Enable-Foreign-Language-Signs.patch → CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
View File

@ -1,4 +1,4 @@
From 5e2c8a0842c884aa101d794af94e1cfae23473fa Mon Sep 17 00:00:00 2001
From 1a0dd596df41308fe8c1e954cccb1d5a3879f4b4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:53:03 +1000
Subject: [PATCH] Enable Foreign Language Signs

2
CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch → CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
View File

@ -1,4 +1,4 @@
From f773330e5a2472fae25d33a881de951c15f82d3e Mon Sep 17 00:00:00 2001
From 0d7fc293b27d13dbb22bd21696309d027f2c9ad2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:59:22 +1000
Subject: [PATCH] Spam Filter Exclusions

2
CraftBukkit-Patches/0048-Allow-Disabling-of-Command-Logging.patch → CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,4 +1,4 @@
From e2659f584c9a26dba16a01be9b76f9e61bde72a5 Mon Sep 17 00:00:00 2001
From c267d44c2cbdde30d95cb7b336b9f1d2d63931d1 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

2
CraftBukkit-Patches/0049-Allow-Disabling-of-Command-TabComplete.patch → CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,4 +1,4 @@
From c99635176c037bf74ff31cb6a56ea52a1d1be752 Mon Sep 17 00:00:00 2001
From 773047f77ed882b4ea5e5b25598a216224050a39 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

2
CraftBukkit-Patches/0050-Configurable-Messages.patch → CraftBukkit-Patches/0049-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From 9630657d94dc1b99321e2c7ed729d386c1bc1286 Mon Sep 17 00:00:00 2001
From 6041ff35b3b180bb6b0c77b81143934f229005d5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages

2
CraftBukkit-Patches/0051-Allow-Disabling-of-Random-Lighting-Updates.patch → CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From 69c148974207bce39d5b0f6052543fc07ccb3b91 Mon Sep 17 00:00:00 2001
From 4e1981e8ccbb240b82000e46ee6d9289bd83f885 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates

2
CraftBukkit-Patches/0052-Add-Log-Filtering.patch → CraftBukkit-Patches/0051-Add-Log-Filtering.patch
View File

@ -1,4 +1,4 @@
From 625a88686e7b0a6f24c79b5ae777d02a32e9cbcd Mon Sep 17 00:00:00 2001
From 7f9913f4949ab5635570f2130c703cd65e8dff6d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:40:11 +1000
Subject: [PATCH] Add Log Filtering

2
CraftBukkit-Patches/0053-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch → CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
View File

@ -1,4 +1,4 @@
From f67c56f2cf2284b18a8a76b51cbfb5af1b82597e Mon Sep 17 00:00:00 2001
From a1df00f1fe411d0b4f103700b14f70c685feb2af Mon Sep 17 00:00:00 2001
From: Andre LeBlanc <andre@norcode.com>
Date: Sat, 6 Apr 2013 12:00:31 -0400
Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

4
CraftBukkit-Patches/0054-Always-Fire-PreLoginEvent.patch → CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
View File

@ -1,11 +1,11 @@
From f4475965718000771df7605bf5ea0f60510aca77 Mon Sep 17 00:00:00 2001
From 4c1c269487e6d9d88f3b08cc279d19b7ea0ec6d5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 25 Jun 2013 18:09:26 +1000
Subject: [PATCH] Always Fire PreLoginEvent
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index b5c305b..2da1a4a 100644
index d26b4d2..9b8ddd2 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -110,7 +110,7 @@ public class PendingConnection extends Connection {

2
CraftBukkit-Patches/0055-Properly-Close-Inventories.patch → CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
View File

@ -1,4 +1,4 @@
From 3808803127bfd8c60cf34b5760e29dfc83c96ee2 Mon Sep 17 00:00:00 2001
From 6230fbb01c9744202288e9acef8953f25cf2c394 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories

2
CraftBukkit-Patches/0056-Disallow-Interaction-With-Self.patch → CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
View File

@ -1,4 +1,4 @@
From 91f19674d7c1182b8c20394f24ce942e2d75e40e Mon Sep 17 00:00:00 2001
From 726fc5818b238c910ad06a08aa07542cb48cab90 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

4
CraftBukkit-Patches/0057-Lower-Chunk-Compression.patch → CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
View File

@ -1,4 +1,4 @@
From ebe19863a959976b5cfec8b1642fc519c32f12a5 Mon Sep 17 00:00:00 2001
From 2d0a030113a33e17473b14577b295e468625fcdf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:07:54 +1000
Subject: [PATCH] Lower Chunk Compression
@ -6,7 +6,7 @@ Subject: [PATCH] Lower Chunk Compression
Use a chunk compression level of 4 - this provides an optimal balance between speed and compression.
diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
index df87ab5..4ef8881 100644
index 91d7feb..29baf6d 100644
--- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
+++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
@@ -29,7 +29,7 @@ public class Packet51MapChunk extends Packet {

2
CraftBukkit-Patches/0058-Silence-End-of-Stream-Errors.patch → CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch
View File

@ -1,4 +1,4 @@
From 0f2f15df96ea7d62664ababc5e7ba39b56601141 Mon Sep 17 00:00:00 2001
From c4fd50b8f90a07ce9b2d2fff3df0cfa3f1dcc79e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:51:38 +1000
Subject: [PATCH] Silence End of Stream Errors

8
CraftBukkit-Patches/0061-Entity-Mount-and-Dismount-Events.patch → CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,14 +1,14 @@
From 19fdd2e4302b1bc3be272274ee6e77a389d7bb44 Mon Sep 17 00:00:00 2001
From e87d5c46dc469f08b5fd0db8a06301fa83f9f78e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 700e450..ea6762e 100644
index 8fbf811..83f6730 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1413,6 +1413,7 @@ public abstract class Entity {
@@ -1409,6 +1409,7 @@ public abstract class Entity {
if ((this.bukkitEntity instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) {
VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
pluginManager.callEvent(event);
@ -16,7 +16,7 @@ index 700e450..ea6762e 100644
}
// CraftBukkit end
@@ -1432,6 +1433,17 @@ public abstract class Entity {
@@ -1428,6 +1429,17 @@ public abstract class Entity {
}
}
// CraftBukkit end

22
CraftBukkit-Patches/0059-Actually-Use-Results-of-PingEvent.patch
View File

@ -1,22 +0,0 @@
From bbc35566e6de193bc17b835afe0ef855b6b06a5d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 14:28:52 +1000
Subject: [PATCH] Actually Use Results of PingEvent
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 2da1a4a..14eed05 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -155,7 +155,7 @@ public class PendingConnection extends Connection {
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
- List list = Arrays.asList(new Serializable[] { Integer.valueOf(1), Integer.valueOf(73), this.server.getVersion(), this.server.getMotd(), Integer.valueOf(playerlist.getPlayerCount()), Integer.valueOf(playerlist.getMaxPlayers())});
+ List list = Arrays.asList(new Serializable[] { Integer.valueOf(1), Integer.valueOf(73), this.server.getVersion(), pingEvent.getMotd(), Integer.valueOf(playerlist.getPlayerCount()), pingEvent.getMaxPlayers()});
Object object;
--
1.8.1.2

22
CraftBukkit-Patches/0060-Use-correct-variable-when-migrating-world.patch
View File

@ -1,22 +0,0 @@
From 128c79fd349a9c1b2d5b7c954a18144815b66ee7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:10:46 +1000
Subject: [PATCH] Use correct variable when migrating world
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 399db47..473a629 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -231,7 +231,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
}
- this.c(name);
+ this.b(name);
// CraftBukkit
world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, worldsettings, this.worlds.get(0), this.methodProfiler, this.getLogger(), Environment.getEnvironment(dimension), gen);
--
1.8.1.2