Add a skeleton api impl to show how spigot specific APIs will be made
Dieser Commit ist enthalten in:
Ursprung
606c18471c
Commit
e9757fa533
37
Bukkit-Patches/0008-Add-Arrow-API.patch
Normale Datei
37
Bukkit-Patches/0008-Add-Arrow-API.patch
Normale Datei
@ -0,0 +1,37 @@
|
||||
From 6ee9f0d8a224b6746dbfb8112f94a81360efe17f Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:08:24 +1000
|
||||
Subject: [PATCH] Add Arrow API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
|
||||
index 26d3473..df177bc 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Arrow.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Arrow.java
|
||||
@@ -3,4 +3,22 @@ package org.bukkit.entity;
|
||||
/**
|
||||
* Represents an arrow.
|
||||
*/
|
||||
-public interface Arrow extends Projectile {}
|
||||
+public interface Arrow extends Projectile
|
||||
+{
|
||||
+
|
||||
+ public class Spigot
|
||||
+ {
|
||||
+
|
||||
+ public double getDamage()
|
||||
+ {
|
||||
+ throw new UnsupportedOperationException( "Not supported yet." );
|
||||
+ }
|
||||
+
|
||||
+ public void setDamage(double damage)
|
||||
+ {
|
||||
+ throw new UnsupportedOperationException( "Not supported yet." );
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ Spigot spigot();
|
||||
+}
|
||||
--
|
||||
1.8.1.2
|
||||
|
28
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
Normale Datei
28
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
Normale Datei
@ -0,0 +1,28 @@
|
||||
From ff2fcf3f4c863531cbb4f86ce3b8ea4f7a8ed243 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
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||||
index b46b9c4..c91b12c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||||
@@ -40,4 +40,14 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
|
||||
public EntityType getType() {
|
||||
return EntityType.ARROW;
|
||||
}
|
||||
+
|
||||
+ // Spigot start
|
||||
+ private final Spigot spigot = new Spigot()
|
||||
+ {
|
||||
+ };
|
||||
+ public Spigot spigot()
|
||||
+ {
|
||||
+ return spigot;
|
||||
+ }
|
||||
+ // Spigot end
|
||||
}
|
||||
--
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ede8bf76dc3f85f432166caea6a17c905eb3c278 Mon Sep 17 00:00:00 2001
|
||||
From 1dd9dbc277e2a8afd185b7acab193b6913da26e7 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 14 May 2013 12:06:27 +1000
|
||||
Subject: [PATCH] Spigot Configuration
|
||||
@ -26,5 +26,5 @@ index 7261dc9..10ce69d 100644
|
||||
if (!this.getOnlineMode()) {
|
||||
this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From cce310966a8e22dfa16ed5b767571fba2af12275 Mon Sep 17 00:00:00 2001
|
||||
From 22cc47a082b3be3c1d9d3b129b99b7fcff526284 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 4 May 2013 10:14:01 +1000
|
||||
Subject: [PATCH] Spigot Changes
|
||||
@ -863,5 +863,5 @@ index 61a95e3..f2ce75e 100644
|
||||
monsters: 70
|
||||
animals: 15
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 442c50bdefd5d2e1ab02bec593da75eed557ea05 Mon Sep 17 00:00:00 2001
|
||||
From c1f139d1b8556e177e82a4af5427668e932bacb1 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 23 Apr 2013 11:22:07 +1000
|
||||
Subject: [PATCH] Proxy IP Filter
|
||||
@ -83,5 +83,5 @@ index f2ce75e..b7c0376 100644
|
||||
default:
|
||||
growth-chunks-per-tick: 650
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 8786751ea0257600e6c0cbd3be6e3a8ddb4b699b Mon Sep 17 00:00:00 2001
|
||||
From e06797e10a91fd0b1e19b9dee8b4eed064f7ad1f Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 09:46:33 +1100
|
||||
Subject: [PATCH] Merge tweaks and configuration
|
||||
@ -113,5 +113,5 @@ index b7c0376..92241d9 100644
|
||||
cactus-growth-modifier: 100
|
||||
melon-growth-modifier: 100
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3f10525ca3a5e8c488a1a9bbfe9fde6f72780b46 Mon Sep 17 00:00:00 2001
|
||||
From 2ecfad78b61cb4387b95bea5fced24674f11c5c2 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 09:29:43 +1100
|
||||
Subject: [PATCH] LongHash Tweaks.
|
||||
@ -130,5 +130,5 @@ index 01861cc..dbd33fa 100644
|
||||
long[] inner = keys[index];
|
||||
if (inner == null) {
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e0329a8be1bde7ee5fb46501ff9e65bf93568e45 Mon Sep 17 00:00:00 2001
|
||||
From e3937541b59ed0f9e22ae526fc5a80472bc61c92 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
|
||||
@ -114,5 +114,5 @@ index 8c30bf5..13532d9 100644
|
||||
|
||||
getHandle().playerConnection.disconnect(message == null ? "" : message);
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2b94f7c77f07a6de7a567a234e562dd76198ec3b Mon Sep 17 00:00:00 2001
|
||||
From 615788f930d232e0babb5dea4e2ba858e51e0cfb Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 09:52:41 +1100
|
||||
Subject: [PATCH] View Distance
|
||||
@ -74,5 +74,5 @@ index 92241d9..10ef7f2 100644
|
||||
random-light-updates: true
|
||||
water-creatures-per-chunk: 0
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b1011da0e288e3f61f8eadb6e6c15b9c859b81d9 Mon Sep 17 00:00:00 2001
|
||||
From 0158463f8c0e7099b9bebe51973af84f6f0e3455 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Primm <mike@primmhome.com>
|
||||
Date: Sun, 13 Jan 2013 03:49:07 -0800
|
||||
Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
|
||||
@ -400,5 +400,5 @@ index 1a21516..6921206 100644
|
||||
}
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5bb52be208f1e396596280ff658b8a6e91b33265 Mon Sep 17 00:00:00 2001
|
||||
From 3cd5b8537185c13f0dbc8960f9b13704f9b7ac61 Mon Sep 17 00:00:00 2001
|
||||
From: Ammar Askar <ammar@ammaraskar.com>
|
||||
Date: Fri, 18 Jan 2013 16:20:01 +0500
|
||||
Subject: [PATCH] Optimize packet used to unload chunks for the client
|
||||
@ -48,5 +48,5 @@ index 10a43b6..20f8e8a 100644
|
||||
entityplayer.chunkCoordIntPairQueue.remove(this.location);
|
||||
if (this.b.isEmpty()) {
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 09c0afb41d80f2474769b7360582e83b459923ba Mon Sep 17 00:00:00 2001
|
||||
From efc966adb6c138f68d65b428b3418a7e9b60b598 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Primm <mike@primmhome.com>
|
||||
Date: Wed, 16 Jan 2013 15:27:22 -0600
|
||||
Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache
|
||||
@ -31,5 +31,5 @@ index 3f9c453..6d59bc3 100644
|
||||
}
|
||||
// CraftBukkit end
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 33632725e31f17845bf9b111ef3a500aa3ace5f3 Mon Sep 17 00:00:00 2001
|
||||
From a1f7d665a0c8e86ffe0fb3627c08f886836baf04 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] Tick loop optimization - sleep for as long as possible.
|
||||
@ -130,5 +130,5 @@ index 0000000..f114a31
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 686a257cf480797672667e37893b63351f676ad8 Mon Sep 17 00:00:00 2001
|
||||
From 98062ce09bdbbd6f48f883bf84c2644e316703af 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
|
@ -1,4 +1,4 @@
|
||||
From c7d781f5bf898cf2250310ad992e2cf016cfd1c3 Mon Sep 17 00:00:00 2001
|
||||
From 4f558e426349bce8fc1deb34576d6ad00331a546 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Thu, 16 May 2013 18:51:05 +1000
|
||||
Subject: [PATCH] Orebfuscator
|
@ -1,4 +1,4 @@
|
||||
From 01f20660e4bc91998c091310746eb05d1d0fe782 Mon Sep 17 00:00:00 2001
|
||||
From e81d7a679a63107fd894beb6e11b9006afe4fb80 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 29 Jan 2013 13:25:53 -0500
|
||||
Subject: [PATCH] Only count entities in chunks being processed for the spawn
|
||||
@ -102,5 +102,5 @@ index 056100f..3529074 100644
|
||||
continue label110;
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9318443175872f9a1c21c351148b052778625c54 Mon Sep 17 00:00:00 2001
|
||||
From 1fc9f7e78ef68f03e1c3d8f052d038987ee0de98 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 3 Feb 2013 09:20:19 +1100
|
||||
Subject: [PATCH] Detect, remove and warn about null tile entities.
|
||||
@ -23,5 +23,5 @@ index feb657b..c547ecc 100644
|
||||
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
|
||||
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4886c3dc2c666f6726df9643a4ce71d5e8288d24 Mon Sep 17 00:00:00 2001
|
||||
From 82cc9466f8c48a7f33711f681e070faf45dfcc8b 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 c4fa4f3..79a8329 100644
|
||||
index 978b6ef..861c8e1 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 {
|
||||
@ -425,7 +425,7 @@ index e5004b3..e89c3a5 100644
|
||||
|
||||
public static boolean filterIp(PendingConnection con) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
index bbb6368..d8f73ad 100644
|
||||
index f5befbf..51714c8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
@@ -29,6 +29,9 @@ public class SpigotTimings {
|
||||
@ -453,5 +453,5 @@ index e08325d..96d26d4 100644
|
||||
world:
|
||||
growth-chunks-per-tick: 1000
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 239364226632569bd61bdda0d0f6849fb2df6452 Mon Sep 17 00:00:00 2001
|
||||
From 21a14e48fded76d3ef5510e1ce9f68044e1a4c16 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Feb 2013 08:58:35 +1100
|
||||
Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the
|
||||
@ -710,5 +710,5 @@ index 0000000..f1690a2
|
||||
+}
|
||||
\ No newline at end of file
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e6e61e6fecc68b7870230273a6510b751826bb21 Mon Sep 17 00:00:00 2001
|
||||
From df94e657a276b27d690c146e8a8d11f703c17600 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.
|
@ -1,4 +1,4 @@
|
||||
From b34087956ae223943a5d29c766f16b0e888dc702 Mon Sep 17 00:00:00 2001
|
||||
From 116660b99d312b4d84956541a7fbc351778d4365 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 23 Apr 2013 11:47:32 +1000
|
||||
Subject: [PATCH] Netty
|
@ -1,4 +1,4 @@
|
||||
From 5a59a9e0be3ca5e595a225cafb14dc161ad49840 Mon Sep 17 00:00:00 2001
|
||||
From cae89b15483e8f9e69420c90ad470e7e25e836b6 Mon Sep 17 00:00:00 2001
|
||||
From: EdGruberman <ed@rjump.com>
|
||||
Date: Fri, 22 Feb 2013 09:23:51 -0700
|
||||
Subject: [PATCH] Return bed location itself instead of next to bed; Fixes
|
||||
@ -41,5 +41,5 @@ index 13532d9..0b5ea21 100644
|
||||
return null;
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 34556739aa826604755ba587d45c4a9c7270ee5d Mon Sep 17 00:00:00 2001
|
||||
From c041fb6421ee248dcd5153a2af8bf89bc7b25a54 Mon Sep 17 00:00:00 2001
|
||||
From: EdGruberman <ed@rjump.com>
|
||||
Date: Tue, 12 Feb 2013 16:17:31 -0700
|
||||
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
|
||||
@ -26,5 +26,5 @@ index 169fa90..5ccc7f0 100644
|
||||
exit = exitWorld.getWorld().getSpawnLocation();
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d179b3bdf151369ac89b30a7b80159fa5e0cd0cf Mon Sep 17 00:00:00 2001
|
||||
From 62ac86e7fe40da764ea862b8e3f656345a479d75 Mon Sep 17 00:00:00 2001
|
||||
From: Yariv Livay <yarivlivay@gmail.com>
|
||||
Date: Sat, 2 Mar 2013 09:36:52 +1100
|
||||
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
|
||||
@ -32,5 +32,5 @@ index f697d85..1dfb02f 100644
|
||||
this.h();
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7240644f227e09211adc0528dc79434d1496b80e Mon Sep 17 00:00:00 2001
|
||||
From e5914957acf2984ffbfab5615034505a1aa208f5 Mon Sep 17 00:00:00 2001
|
||||
From: Yariv Livay <yarivlivay@gmail.com>
|
||||
Date: Mon, 25 Feb 2013 22:26:36 +0200
|
||||
Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally
|
||||
@ -18,5 +18,5 @@ index 7de5b48..9925d1b 100644
|
||||
if (this.isSleeping()) {
|
||||
this.o().getTracker().sendPacketToEntity(this, new Packet18ArmAnimation(this, 3));
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 587f66f4c3618911fb8b7f35fb8c0fa9faea2492 Mon Sep 17 00:00:00 2001
|
||||
From 1263b12571893f612628d4c6c2c5f1e8df702eef Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 4 Mar 2013 18:45:52 +1100
|
||||
Subject: [PATCH] PlayerItemDamageEvent
|
||||
@ -50,5 +50,5 @@ index 343b8cb..9c2fce6 100644
|
||||
if (entityliving instanceof EntityHuman) {
|
||||
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bb5d2f99affb43f22ef7f16560ad6d6f7769fb33 Mon Sep 17 00:00:00 2001
|
||||
From 09451a41363411c2e39bf31616ce1dcc0d2ddb6a Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 17 Mar 2013 19:02:50 +1100
|
||||
Subject: [PATCH] Faster UUID for entities
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Faster UUID for entities
|
||||
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 79a8329..8767950 100644
|
||||
index 861c8e1..ae2db03 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -153,7 +153,7 @@ public abstract class Entity {
|
||||
@ -19,5 +19,5 @@ index 79a8329..8767950 100644
|
||||
this.world = world;
|
||||
this.setPosition(0.0D, 0.0D, 0.0D);
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 84eb369fce9dc020887e0a12a34cfcc4d60792ff Mon Sep 17 00:00:00 2001
|
||||
From e18535ba8af6ac3762aafdb822ec821c471edef0 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 18 Mar 2013 20:01:44 +1100
|
||||
Subject: [PATCH] Prevent NPE in CraftSign
|
||||
@ -32,5 +32,5 @@ index 1647100..43c4434 100644
|
||||
if(lines[i] != null) {
|
||||
sign.lines[i] = lines[i];
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f42cdf26ec5cb3f6e2b779d1a528b4ee4c33b0e5 Mon Sep 17 00:00:00 2001
|
||||
From 08e448de784e226be1f441d7772ee13dfdf11162 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Thu, 21 Mar 2013 17:00:54 +1100
|
||||
Subject: [PATCH] Stage DataWatcher & WatchableObject.
|
||||
@ -349,5 +349,5 @@ index 0000000..678aa91
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4c3900fbf24c986c9f13dadaf9bca06e1794dac2 Mon Sep 17 00:00:00 2001
|
||||
From d82d7f2c415d2d222e1aa88a75318d6a047799a0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 20 Feb 2013 11:58:47 -0500
|
||||
Subject: [PATCH] Entity Tracking Ranges
|
||||
@ -146,5 +146,5 @@ index d26e644..71374d7 100644
|
||||
world:
|
||||
growth-chunks-per-tick: 1000
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2f2271a64bb6770f9a7a3224d585e6dd18caf0c0 Mon Sep 17 00:00:00 2001
|
||||
From 6b2a6b0338058abbe9221578bbb97b8415d409da 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
|
||||
@ -59,7 +59,7 @@ index fcd4136..fb4ec7b 100644
|
||||
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
|
||||
index fed3181..a0c66d8 100644
|
||||
index 2422d29..861cfd9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
@@ -54,6 +54,7 @@ public class Spigot {
|
||||
@ -107,5 +107,5 @@ index 71374d7..f0d9129 100644
|
||||
default:
|
||||
growth-chunks-per-tick: 650
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0c415386eb2d5067b50fe09a5db3bfb7288bf7e2 Mon Sep 17 00:00:00 2001
|
||||
From 890ebddcce4bf2ca1660e415c05485797feb80ef Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 13:04:45 +1100
|
||||
Subject: [PATCH] Texture Pack Resolutions
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Texture Pack Resolutions
|
||||
Fix issues when specifiying a server texture pack URL with resolution != 16.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index d57ed7a..6a6181c 100644
|
||||
index d197f06..e348ac5 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1076,7 +1076,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@ -19,7 +19,7 @@ index d57ed7a..6a6181c 100644
|
||||
|
||||
public abstract boolean T();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
index a0c66d8..7fafe01 100644
|
||||
index 861cfd9..9ac137a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
@@ -55,6 +55,7 @@ public class Spigot {
|
||||
@ -39,7 +39,7 @@ index a0c66d8..7fafe01 100644
|
||||
if (metrics == null) {
|
||||
try {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index fa9b9f1..786b78d 100644
|
||||
index 26cb661..382fc41 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -830,7 +830,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@ -64,5 +64,5 @@ index f0d9129..cdf66e1 100644
|
||||
default:
|
||||
growth-chunks-per-tick: 650
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From eaaa019cdcb5299aff6e559f8a994de977ffb6dc Mon Sep 17 00:00:00 2001
|
||||
From b108a628d8ca2adbe0bcf74982ccbca49089db54 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 19:08:41 +1100
|
||||
Subject: [PATCH] Limit Custom Map Rendering
|
||||
@ -70,5 +70,5 @@ index b28d6a3..e70e4e4 100644
|
||||
protected final WorldMap worldMap;
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b14eb452993c78acf37685b5c0a39cbc9fae836c Mon Sep 17 00:00:00 2001
|
||||
From 52539ec48972b810f9f8d459956262eba3472533 Mon Sep 17 00:00:00 2001
|
||||
From: Hudson <hudson@mydomain.com>
|
||||
Date: Wed, 3 Apr 2013 02:16:56 -0500
|
||||
Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes
|
||||
@ -29,5 +29,5 @@ index 84dcfcc..0a5c61a 100644
|
||||
|
||||
private int nextId() {
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 8ea1953b38cabdbc03f90d19d79c519f103b8de8 Mon Sep 17 00:00:00 2001
|
||||
From 6c184f6e64f5c8c223f37366747dca8e1565c0ab Mon Sep 17 00:00:00 2001
|
||||
From: Tyler Blair <hidendra@griefcraft.com>
|
||||
Date: Tue, 9 Apr 2013 17:55:15 -0300
|
||||
Subject: [PATCH] InventoryClickEvent now can return if the click was a double
|
||||
@ -35,5 +35,5 @@ index 2e1246e..0621625 100644
|
||||
org.bukkit.inventory.ItemStack item = event.getCurrentItem();
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4204de932f4343febfd8d1b7e25edb9ccd6f8d10 Mon Sep 17 00:00:00 2001
|
||||
From 442538d67c0da2a21a5ab2c822713eba629fc30a 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
|
||||
@ -20,7 +20,7 @@ index 9925d1b..5fa0b05 100644
|
||||
|
||||
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 cc9c3ba..319974b 100644
|
||||
index 6af611a..0a48245 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -724,7 +724,23 @@ public abstract class PlayerList {
|
||||
@ -48,7 +48,7 @@ index cc9c3ba..319974b 100644
|
||||
public void sendAll(Packet packet) {
|
||||
for (int i = 0; i < this.players.size(); ++i) {
|
||||
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
|
||||
index 8d07ae2..871b984 100644
|
||||
index cdf66e1..8f48c0f 100644
|
||||
--- a/src/main/resources/configurations/bukkit.yml
|
||||
+++ b/src/main/resources/configurations/bukkit.yml
|
||||
@@ -34,6 +34,7 @@ settings:
|
||||
@ -60,5 +60,5 @@ index 8d07ae2..871b984 100644
|
||||
restart-on-crash: false
|
||||
restart-script-location: /path/to/server/start.sh
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0472f861774f4b595adfe6554d6418095218be90 Mon Sep 17 00:00:00 2001
|
||||
From 7371e8acd34c5e462e59f990240dc52e44aeb962 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
|
||||
Date: Sun, 14 Apr 2013 21:19:57 +0500
|
||||
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
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
index 7fafe01..2f4dcd9 100644
|
||||
index 9ac137a..8772350 100644
|
||||
--- a/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;
|
||||
@ -56,5 +56,5 @@ index 7fafe01..2f4dcd9 100644
|
||||
* @param defaultRange Default range defined by Mojang
|
||||
* @return
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From b5e5145a64d772c22a4b0967dfdd31bec35e3f95 Mon Sep 17 00:00:00 2001
|
||||
From 3baffd4e017b02dc0f7e8ced62678cc9c2d66797 Mon Sep 17 00:00:00 2001
|
||||
From: Ammar Askar <ammar@ammaraskar.com>
|
||||
Date: Sat, 20 Apr 2013 12:26:20 +0500
|
||||
Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid
|
||||
@ -75,5 +75,5 @@ index 3529074..25b83f7 100644
|
||||
}
|
||||
return i;
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7ee0a66502aeb629a002b346fcd7c4cfb2de0257 Mon Sep 17 00:00:00 2001
|
||||
From 89baea1244c5bd0d245687c6de5a23cd5c23a9a9 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 23 Apr 2013 11:50:27 +1000
|
||||
Subject: [PATCH] Thread Naming and Tweaks
|
||||
@ -56,5 +56,5 @@ index 0a5c61a..35badf3 100644
|
||||
private CraftAsyncDebugger debugTail = debugHead;
|
||||
private static final int RECENT_TICKS;
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a455b71218576824266aba2ec75d19dbe642081d Mon Sep 17 00:00:00 2001
|
||||
From 849e612582e29a97fb9fdff7b0801f70bc605fdc Mon Sep 17 00:00:00 2001
|
||||
From: Antony Riley <antony@cyberiantiger.org>
|
||||
Date: Wed, 27 Mar 2013 01:41:54 +0200
|
||||
Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is
|
||||
@ -63,5 +63,5 @@ index fc9170f..bfa19e6 100644
|
||||
}
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7fc33371f89d29558ce22c66fcec47e6b1b13038 Mon Sep 17 00:00:00 2001
|
||||
From 5cbf818b79388ec772c2747b2b18a66e6645e99c Mon Sep 17 00:00:00 2001
|
||||
From: snowleo <schneeleo@gmail.com>
|
||||
Date: Wed, 8 May 2013 12:09:45 +1000
|
||||
Subject: [PATCH] Optimized version of LocaleLanguage
|
||||
@ -170,5 +170,5 @@ index d88f864..2a52fe3 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6db12ad6017b2f85d480e1f3609a269573a65adc Mon Sep 17 00:00:00 2001
|
||||
From 48582cf8be777dc589366fa9067709b3d6954de7 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Primm <mike@primmhome.com>
|
||||
Date: Wed, 24 Apr 2013 01:43:33 -0500
|
||||
Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large
|
||||
@ -308,5 +308,5 @@ index a2f7fee..b0c2c96 100644
|
||||
+ // Spigot end
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ce31e09b9032e1abe136f424ee7800c5c3c70227 Mon Sep 17 00:00:00 2001
|
||||
From 77e98dfc4dbfe67142db7b7b1bf60048b2feb979 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 19 May 2013 18:29:48 +1000
|
||||
Subject: [PATCH] Remove -o Option
|
||||
@ -19,5 +19,5 @@ index 03aa219..a45c4ea 100644
|
||||
}
|
||||
|
||||
--
|
||||
1.8.2.1
|
||||
1.8.1.2
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ad17ba80c942959985d3de1a5a31680c8e0c1856 Mon Sep 17 00:00:00 2001
|
||||
From 92b1b9a12f5a5fb763a562f6c59803c648ae8548 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 1 Jun 2013 16:34:38 +1000
|
||||
Subject: [PATCH] Recipe Deconstruction
|
@ -1,4 +1,4 @@
|
||||
From f2a8c9f207bf8e51ce517f8c0ceb647968567b66 Mon Sep 17 00:00:00 2001
|
||||
From 6f39ac92dbda094dd5401cb1550f1f173ca4d765 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
|
@ -1,4 +1,4 @@
|
||||
From 54a96733b7fb128f6b389121c0ef320715f37fd1 Mon Sep 17 00:00:00 2001
|
||||
From 2b96943c178999ef32038e0522da812980ea8cb2 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Minkler <sleaker@gmail.com>
|
||||
Date: Sun, 2 Jun 2013 15:04:37 +1000
|
||||
Subject: [PATCH] Fix EntityShootBowEvent with Skeletons
|
In neuem Issue referenzieren
Einen Benutzer sperren