core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should probably do an upstream update.

This commit is contained in:
md_5 2013-07-24 19:29:30 +10:00
parent 32eb618d1c
commit 5d31ee288a
15 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit f638ec1bfbcfd6bb1cf21d427d76ea1db640b235
Subproject commit 08c71f24abc214bb6995a7266593dbb2217ddde1

18
Bukkit-Patches/0006-BungeeCord-Support.patch
View File

@ -1,25 +1,17 @@
From 6529e4d6c6a0b3a11775299d9838a46ee16c92a8 Mon Sep 17 00:00:00 2001
From b1bf254e16c2dc76aaf59033d7e1645a6bc19ccf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5c5d526..724f601 100644
index 3b58d12..0519c55 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -647,7 +647,6 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* yet or has logged out
@@ -691,4 +691,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException;
-
/**
* Gets if the client is displayed a 'scaled' health, that is, health on a
* scale from 0-20.
@@ -667,4 +666,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param scale if the client health display is scaled
*/
public void setScaleHealth(boolean scale);
public double getHealthScale();
+
+ // Spigot start
+ public class Spigot

6
Bukkit-Patches/0008-Add-Particle-API.patch
View File

@ -1,4 +1,4 @@
From b08b4b61746b4a26079cc40f2d4b991e56f6f0a7 Mon Sep 17 00:00:00 2001
From 8a68a3ace4aac7d385184dbd10b33140dcc8be60 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
@ -320,10 +320,10 @@ index e14fe40..9ae9b2d 100644
* Represents various map environment types that a world may be
*/
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 724f601..376ceef 100644
index 0519c55..d602594 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -681,6 +681,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -706,6 +706,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

2
CraftBukkit

@ -1 +1 @@
Subproject commit dc253127ad2546e051d57e3b5cc09e31492f91ae
Subproject commit 74f60d87ff8ba8bc47b9050b1da48d6daa203f15

10
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@ -1,4 +1,4 @@
From 3d9160caf85e0157802ddbbc5ccc519387eccd3e Mon Sep 17 00:00:00 2001
From 625173b0a71830d89ebbef0f8c23dd0dae985b57 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -43,12 +43,12 @@ index b46b9c4..c91b12c 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 977adff..5628d84 100644
index fd73856..25deaa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1010,4 +1010,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isScaledHealth() {
return this.scaledHealth;
@@ -1065,4 +1065,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}
+
+ // Spigot start

12
CraftBukkit-Patches/0012-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From a7ffffafca73803554e56ab978d6b1334a58969a Mon Sep 17 00:00:00 2001
From c03134ec78557b243c61be2550a093a349ddfcd5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100
Subject: [PATCH] Async Operation Catching
@ -26,10 +26,10 @@ index a8e45dd..7f23f71 100644
EntityPlayer entityplayer = (EntityPlayer) entity;
Iterator iterator = this.b.iterator();
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 673c204..b14e1e0 100644
index e05296c..dc251dd 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -292,6 +292,7 @@ public class EntityTrackerEntry {
@@ -297,6 +297,7 @@ public class EntityTrackerEntry {
}
public void updatePlayer(EntityPlayer entityplayer) {
@ -37,7 +37,7 @@ index 673c204..b14e1e0 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -501,6 +502,7 @@ public class EntityTrackerEntry {
@@ -511,6 +512,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
@ -102,10 +102,10 @@ index 8881878..e8bb8ae 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5628d84..5bf0e3c 100644
index 25deaa9..360d45c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -218,6 +218,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void kickPlayer(String message) {

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

@ -1,4 +1,4 @@
From 8606186a726ed47563cc3714dce414776efe0f19 Mon Sep 17 00:00:00 2001
From 63b6bcfae16694dce46b4b077fcea833212b367b 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 671384d..e095ae0 100644
index 50edbdb..76d9998 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;
@ -144,10 +144,10 @@ index f025083..f52d619 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 ff685d5..54e96c2 100644
index 6aa7a21..1509a30 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -949,6 +949,7 @@ public class PlayerConnection extends Connection {
@@ -947,6 +947,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@ -155,7 +155,7 @@ index ff685d5..54e96c2 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -956,19 +957,23 @@ public class PlayerConnection extends Connection {
@@ -954,19 +955,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {

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

@ -1,4 +1,4 @@
From 99d17efe9c774886f0428e437ce375ee92409e49 Mon Sep 17 00:00:00 2001
From c8169d9a04a7ee9d4d4710633f5e5bdbcf8ec667 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
@ -28,7 +28,7 @@ index b433c60..0eacd84 100644
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f24ba95..a031af1 100644
index 0f17c90..388acf9 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -295,7 +295,7 @@ public abstract class PlayerList {
@ -59,10 +59,10 @@ index f87ebf9..f5032be 100644
event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5bf0e3c..8af2934 100644
index 360d45c..b956dee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1015,6 +1015,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1070,6 +1070,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Spigot spigot = new Spigot()
{

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

@ -1,23 +1,23 @@
From b118d779aae057d1f31a057c7ed0102e90128af4 Mon Sep 17 00:00:00 2001
From 0a8a33e98273e97eed1086de950036935d1cd42a 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 2191b07..5c9babf 100644
index 58e5217..f9ac1e1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newLevel = 0;
@@ -52,6 +52,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newTotalExp = 0;
public boolean keepLevel = false;
public double maxHealthCache;
+ public int lastPing = -1; // Spigot
// CraftBukkit end
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a031af1..f0bc5c4 100644
index 388acf9..b7b1c45 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -719,6 +719,25 @@ public abstract class PlayerList {

10
CraftBukkit-Patches/0039-Particle-API.patch
View File

@ -1,4 +1,4 @@
From c5261a6c191f636fa6b67b000923efe7ee7eec7c Mon Sep 17 00:00:00 2001
From 6650757fd8a8979912ac0c9063723e3052aafd3d 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
@ -152,10 +152,10 @@ index e8bb8ae..a68169f 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8af2934..88dcced 100644
index b956dee..ce810c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -267,13 +267,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -270,13 +270,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(packet);
}
@ -173,7 +173,7 @@ index 8af2934..88dcced 100644
public <T> void playEffect(Location loc, Effect effect, T data) {
if (data != null) {
@@ -281,9 +279,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -284,9 +282,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@ -191,7 +191,7 @@ index 8af2934..88dcced 100644
}
public void sendBlockChange(Location loc, Material material, byte data) {
@@ -1020,6 +1023,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1075,6 +1078,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
}

6
CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
View File

@ -1,14 +1,14 @@
From 260a6fbca541f490a78f1f82f94ba44cc7325506 Mon Sep 17 00:00:00 2001
From 06367773012a889d6044827499473389d3e3fd29 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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 54e96c2..40ea712 100644
index 1509a30..2d04541 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1567,7 +1567,7 @@ public class PlayerConnection extends Connection {
@@ -1573,7 +1573,7 @@ public class PlayerConnection extends Connection {
flag = false;
} else {
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {

6
CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
View File

@ -1,14 +1,14 @@
From 61c17d644c48969e486ebb8aec1d92bdad6850ee Mon Sep 17 00:00:00 2001
From 96aa10ca1474a46f04f9f3aa29c69d67b9271007 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
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 40ea712..f1a4dfe 100644
index 2d04541..5d669d0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -839,7 +839,17 @@ public class PlayerConnection extends Connection {
@@ -837,7 +837,17 @@ public class PlayerConnection extends Connection {
this.chat(s, packet3chat.a_());
// This section stays because it is only applicable to packets

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

@ -1,14 +1,14 @@
From 3dc8ca3c302fe1dc2593f82a5109f3f71e16882f Mon Sep 17 00:00:00 2001
From ee7d8beccd4867f700f5b368775aca6f429556b2 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 f1a4dfe..34613dc 100644
index 5d669d0..4dc5688 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -972,7 +972,12 @@ public class PlayerConnection extends Connection {
@@ -970,7 +970,12 @@ public class PlayerConnection extends Connection {
}
try {

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

@ -1,14 +1,14 @@
From 1d5973db27210fc53faa77237664838e1e5ee550 Mon Sep 17 00:00:00 2001
From 127323a66fd99fa2f0746e459360244320176f9a 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 34613dc..98b2622 100644
index 4dc5688..0dddd1e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1090,6 +1090,13 @@ public class PlayerConnection extends Connection {
@@ -1088,6 +1088,13 @@ public class PlayerConnection extends Connection {
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = worldserver.getEntity(packet7useentity.target);

6
CraftBukkit-Patches/0064-Client-Crash-Cannot-Send-Message.patch
View File

@ -1,14 +1,14 @@
From cfcb22091f17aaaa97c59f86bc53598d2ea65feb Mon Sep 17 00:00:00 2001
From 3e0dc0666236d41516e37c2f14d9a8dcc2e6f2e1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 10 Jul 2013 23:46:09 +1000
Subject: [PATCH] Client Crash Cannot Send Message
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 98b2622..18cee5b 100644
index 0dddd1e..0c0b1b3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -832,7 +832,7 @@ public class PlayerConnection extends Connection {
@@ -830,7 +830,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit start
if (this.player.getChatFlags() == 1 && !s.startsWith("/")) {