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

Update from upstream SpigotMC 

44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
This commit is contained in:
Zach Brown 2014-12-10 22:21:51 -06:00
parent 8326a255d5
commit 690205b676
22 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
View File

@ -1,4 +1,4 @@
From 55ce35368ebdbbcfc801fea686fbd53c9c2a0a05 Mon Sep 17 00:00:00 2001
From 6002be5a4ba3fbca9e904550bd99cfa29a06c256 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection
An optimized chunk ticking algorithm which better selects chunks around players which are active on the server.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8d5b733..2836702 100644
index b15988a..db05ee3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess {
@ -62,7 +62,7 @@ index 8d5b733..2836702 100644
this.K = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1903,17 +1933,44 @@ public abstract class World implements IBlockAccess {
@@ -1905,17 +1935,44 @@ public abstract class World implements IBlockAccess {
int k;
int l;
@ -111,7 +111,7 @@ index 8d5b733..2836702 100644
this.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 12f80a7..be9c866 100644
index 6ab9354..786a367 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -344,12 +344,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {

12
CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
View File

@ -1,4 +1,4 @@
From 46825f35d92e4d5d2075470c0c17005e35ca6b13 Mon Sep 17 00:00:00 2001
From 39fa5aadc64064cbb6d8674624e05c076951d27a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:17:20 +1000
Subject: [PATCH] Crop Growth Rates
@ -27,7 +27,7 @@ index 59d03ce..12e2b79 100644
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 7046683..8569204 100644
index 6277752..d9f6e0b 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -29,7 +29,7 @@ public class BlockCactus extends Block {
@ -36,7 +36,7 @@ index 7046683..8569204 100644
- if (j == 15) {
+ if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.cactusModifier * 15) + 0.5F, 15)) { // Spigot
world.setTypeUpdate(blockposition1, this.getBlockData());
// world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit
IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
@ -93,7 +93,7 @@ index 8f792e4..cb383a5 100644
IBlockData iblockdata1 = world.getType(blockposition1);
Block block = world.getType(blockposition1.up()).getBlock();
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
index ae7c617..11631da 100644
index f453c36..27b7f81 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -28,7 +28,7 @@ public class BlockReed extends Block {
@ -103,8 +103,8 @@ index ae7c617..11631da 100644
- if (j == 15) {
+ if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.caneModifier * 15) + 0.5F, 15)) { // Spigot
// CraftBukkit start
// world.setTypeUpdate(blockposition.up(), this.getBlockData());
// world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
// world.setTypeUpdate(blockposition.up(), this.getBlockData()); // CraftBukkit
BlockPosition upPos = blockposition.up();
diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
index ff4f576..39c0cba 100644
--- a/src/main/java/net/minecraft/server/BlockSapling.java

6
CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
View File

@ -1,4 +1,4 @@
From 7d95080c00f83f2c05ca97cb44c43ce0d867c5c1 Mon Sep 17 00:00:00 2001
From 0cafd6bbb5b8ad7562688b6dce8d1e64ac062d32 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
@ -41,10 +41,10 @@ index e2c0712..7f16401 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9a218e4..6b53f5b 100644
index db05ee3..57aba85 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -921,6 +921,23 @@ public abstract class World implements IBlockAccess {
@@ -923,6 +923,23 @@ public abstract class World implements IBlockAccess {
// Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}

10
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 732e6fef011332a8b83362216399ccd58e4b7f8d Mon Sep 17 00:00:00 2001
From 76495911ffd8d39b010a3949dd94079ff66c77a6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -66,10 +66,10 @@ index 1204c56..640d7ff 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f953e08..3fb0636 100644
index 57aba85..3982d53 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -891,6 +891,7 @@ public abstract class World implements IBlockAccess {
@@ -893,6 +893,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@ -77,7 +77,7 @@ index f953e08..3fb0636 100644
if (entity == null) return false;
// CraftBukkit end
int i = MathHelper.floor(entity.locX / 16.0D);
@@ -998,6 +999,7 @@ public abstract class World implements IBlockAccess {
@@ -1000,6 +1001,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@ -85,7 +85,7 @@ index f953e08..3fb0636 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2429,6 +2431,7 @@ public abstract class World implements IBlockAccess {
@@ -2431,6 +2433,7 @@ public abstract class World implements IBlockAccess {
}
public void b(Collection collection) {

46
CraftBukkit-Patches/0012-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From e18afad9c20b61ae0d88452917aca5605b267302 Mon Sep 17 00:00:00 2001
From 069bf84fffb35ff8883c68069e12d68c0e61a2e4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -133,7 +133,7 @@ index 424b71d..390c6eb 100644
public boolean ad() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f76dc85..59473f5 100644
index 0682904..4886929 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;
@ -162,7 +162,7 @@ index f76dc85..59473f5 100644
if (this.T) {
this.a(this.getBoundingBox().c(d0, d1, d2));
this.recalcPosition();
@@ -716,6 +721,7 @@ public abstract class Entity implements ICommandListener {
@@ -714,6 +719,7 @@ public abstract class Entity implements ICommandListener {
this.world.methodProfiler.b();
}
@ -171,7 +171,7 @@ index f76dc85..59473f5 100644
private void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0aaee5f..803b5df 100644
index fe324a3..c7fb84b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -17,6 +17,8 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;
@ -183,7 +183,7 @@ index 0aaee5f..803b5df 100644
public abstract class EntityLiving extends Entity {
private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
@@ -1384,6 +1386,7 @@ public abstract class EntityLiving extends Entity {
@@ -1393,6 +1395,7 @@ public abstract class EntityLiving extends Entity {
}
public void s_() {
@ -191,7 +191,7 @@ index 0aaee5f..803b5df 100644
super.s_();
if (!this.world.isStatic) {
int i = this.bu();
@@ -1422,7 +1425,9 @@ public abstract class EntityLiving extends Entity {
@@ -1431,7 +1434,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -201,7 +201,7 @@ index 0aaee5f..803b5df 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -1487,6 +1492,7 @@ public abstract class EntityLiving extends Entity {
@@ -1496,6 +1501,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.aR += f2;
@ -209,7 +209,7 @@ index 0aaee5f..803b5df 100644
}
protected float h(float f, float f1) {
@@ -1551,6 +1557,7 @@ public abstract class EntityLiving extends Entity {
@@ -1560,6 +1566,7 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.a("ai");
@ -217,7 +217,7 @@ index 0aaee5f..803b5df 100644
if (this.bC()) {
this.aW = false;
this.aX = 0.0F;
@@ -1561,6 +1568,7 @@ public abstract class EntityLiving extends Entity {
@@ -1570,6 +1577,7 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.b();
}
@ -225,7 +225,7 @@ index 0aaee5f..803b5df 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -1582,11 +1590,15 @@ public abstract class EntityLiving extends Entity {
@@ -1591,11 +1599,15 @@ public abstract class EntityLiving extends Entity {
this.aX *= 0.98F;
this.aY *= 0.98F;
this.aZ *= 0.9F;
@ -420,7 +420,7 @@ index ec76148..a93ad27 100644
private static Map f = Maps.newHashMap();
private static Map g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3fb0636..2d67346 100644
index 3982d53..ca9984b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import org.bukkit.Bukkit;
@ -440,15 +440,15 @@ index 3fb0636..2d67346 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -162,6 +165,7 @@ public abstract class World implements IBlockAccess {
this.M = worldprovider.getWorldBorder();
@@ -164,6 +167,7 @@ public abstract class World implements IBlockAccess {
this.M.a(new WorldBorderListener(((WorldServer) this).getServer().getHandle())); // CraftBukkit
this.getServer().addWorld(this.world); // CraftBukkit
+ timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
}
public World b() {
@@ -1252,6 +1256,7 @@ public abstract class World implements IBlockAccess {
@@ -1254,6 +1258,7 @@ public abstract class World implements IBlockAccess {
this.g.clear();
this.methodProfiler.c("regular");
@ -456,7 +456,7 @@ index 3fb0636..2d67346 100644
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1268,7 +1273,9 @@ public abstract class World implements IBlockAccess {
@@ -1270,7 +1275,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead) {
try {
@ -466,7 +466,7 @@ index 3fb0636..2d67346 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails = crashreport.a("Entity being ticked");
@@ -1293,7 +1300,9 @@ public abstract class World implements IBlockAccess {
@@ -1295,7 +1302,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@ -476,7 +476,7 @@ index 3fb0636..2d67346 100644
this.L = true;
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.b.isEmpty()) {
@@ -1313,6 +1322,7 @@ public abstract class World implements IBlockAccess {
@@ -1315,6 +1324,7 @@ public abstract class World implements IBlockAccess {
if (this.isLoaded(blockposition) && this.M.a(blockposition)) {
try {
@ -484,7 +484,7 @@ index 3fb0636..2d67346 100644
((IUpdatePlayerListBox) tileentity).c();
} catch (Throwable throwable2) {
CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
@@ -1321,6 +1331,11 @@ public abstract class World implements IBlockAccess {
@@ -1323,6 +1333,11 @@ public abstract class World implements IBlockAccess {
tileentity.a(crashreportsystemdetails1);
throw new ReportedException(crashreport1);
}
@ -496,7 +496,7 @@ index 3fb0636..2d67346 100644
}
}
@@ -1333,6 +1348,8 @@ public abstract class World implements IBlockAccess {
@@ -1335,6 +1350,8 @@ public abstract class World implements IBlockAccess {
}
}
@ -505,7 +505,7 @@ index 3fb0636..2d67346 100644
this.L = false;
/* CraftBukkit start - Moved up
if (!this.b.isEmpty()) {
@@ -1365,6 +1382,7 @@ public abstract class World implements IBlockAccess {
@@ -1367,6 +1384,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}
@ -513,7 +513,7 @@ index 3fb0636..2d67346 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1409,6 +1427,7 @@ public abstract class World implements IBlockAccess {
@@ -1411,6 +1429,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use neighbor cache instead of looking up
Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4);
if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) {
@ -521,7 +521,7 @@ index 3fb0636..2d67346 100644
// CraftBukkit end
entity.P = entity.locX;
entity.Q = entity.locY;
@@ -1472,6 +1491,7 @@ public abstract class World implements IBlockAccess {
@@ -1474,6 +1493,7 @@ public abstract class World implements IBlockAccess {
}
}
@ -530,7 +530,7 @@ index 3fb0636..2d67346 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index fc21cf7..b5627c5 100644
index 737b546..c07f9f8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -212,10 +212,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {

6
CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch
View File

@ -1,14 +1,14 @@
From 7e74340c7f79f3945ef71669e7366b33e5e632db Mon Sep 17 00:00:00 2001
From b37f3c9a0ce5601e9461b69617d8612bdbbfaf51 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] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d67f2eb..9cb7ab8 100644
index ca9984b..a80c375 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1316,6 +1316,13 @@ public abstract class World implements IBlockAccess {
@@ -1318,6 +1318,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

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

@ -1,4 +1,4 @@
From b98d6a30325852e7362c7d74b1ebf300702d662b Mon Sep 17 00:00:00 2001
From aec15dc9337123932c26d8a07f73209517a6a5c1 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
@ -145,7 +145,7 @@ index 8357157..16400c3 100644
super(world);
this.a(0.25F, 0.25F);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 803b5df..a58e4eb 100644
index c7fb84b..6bb5428 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -83,6 +83,13 @@ public abstract class EntityLiving extends Entity {
@ -163,10 +163,10 @@ index 803b5df..a58e4eb 100644
public void G() {
this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7fd8375..f1e18af 100644
index a80c375..5ce3f41 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1256,6 +1256,7 @@ public abstract class World implements IBlockAccess {
@@ -1258,6 +1258,7 @@ public abstract class World implements IBlockAccess {
this.g.clear();
this.methodProfiler.c("regular");
@ -174,7 +174,7 @@ index 7fd8375..f1e18af 100644
timings.entityTick.startTiming(); // Spigot
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
@@ -1431,9 +1432,11 @@ public abstract class World implements IBlockAccess {
@@ -1433,9 +1434,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;

6
CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From a0ca1b6090c638af225f2c897e5fde8fca22429a Mon Sep 17 00:00:00 2001
From 9c6aabd8fbd8d6299a986cb2dc4daada411d6f54 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
@ -18,10 +18,10 @@ index c3059b6..9e9ea23 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e5da9db..372733a 100644
index 5ce3f41..16198c9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2028,7 +2028,7 @@ public abstract class World implements IBlockAccess {
@@ -2030,7 +2030,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");

8
CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,14 +1,14 @@
From 2b8bc08ea51b342aeb3715295abe0373d91e0a40 Mon Sep 17 00:00:00 2001
From 30494ab74e9585b41e4b249b8878b1582dd7c795 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 10e99d1..afa789f 100644
index 178a7a6..3227e8b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1545,6 +1545,7 @@ public abstract class Entity implements ICommandListener {
@@ -1543,6 +1543,7 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
@ -16,7 +16,7 @@ index 10e99d1..afa789f 100644
this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
this.vehicle.passenger = null;
}
@@ -1579,6 +1580,18 @@ public abstract class Entity implements ICommandListener {
@@ -1577,6 +1578,18 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end

10
CraftBukkit-Patches/0037-Player-Collision-API.patch
View File

@ -1,11 +1,11 @@
From 706e9eb2441d6e10b48de5f7784c421dfd35ce61 Mon Sep 17 00:00:00 2001
From 94086c5408d66e1ddf9cf3c498c1934195556399 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 60a5e60..ba2e9f9 100644
index 7546107..ecde3d6 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -25,10 +25,10 @@ index 60a5e60..ba2e9f9 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a58e4eb..e52fa60 100644
index 6bb5428..2d14a0d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1616,7 +1616,7 @@ public abstract class EntityLiving extends Entity {
@@ -1625,7 +1625,7 @@ public abstract class EntityLiving extends Entity {
protected void bK() {
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
@ -38,7 +38,7 @@ index a58e4eb..e52fa60 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4b3e878..b1ce57d 100644
index b212f29..dc92ccf 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

10
CraftBukkit-Patches/0053-Orebfuscator.patch
View File

@ -1,4 +1,4 @@
From 0880b62865e0edb645d203f5189e37ae46293dd1 Mon Sep 17 00:00:00 2001
From ced28f845408949344664e37e3aaf48f0d4db66c 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
@ -79,7 +79,7 @@ index 8af5e1f..9df0d53 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index e6145ac..34c22d2 100644
index 5e7545a..a13610e 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -197,6 +197,7 @@ public class PlayerInteractManager {
@ -91,10 +91,10 @@ index e6145ac..34c22d2 100644
public void a(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7c058fc..d3ee73d 100644
index 16198c9..eac5e3c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -458,6 +458,7 @@ public abstract class World implements IBlockAccess {
@@ -460,6 +460,7 @@ public abstract class World implements IBlockAccess {
this.d(blockposition.up(), block);
this.d(blockposition.north(), block);
this.d(blockposition.south(), block);
@ -102,7 +102,7 @@ index 7c058fc..d3ee73d 100644
}
public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {
@@ -671,9 +672,16 @@ public abstract class World implements IBlockAccess {
@@ -673,9 +674,16 @@ public abstract class World implements IBlockAccess {
return this.worldProvider.p()[this.getLightLevel(blockposition)];
}

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

@ -1,4 +1,4 @@
From 454b3b83ea995cce9695a0bad2f36699c941a295 Mon Sep 17 00:00:00 2001
From 0275b4cfc6008da7830d21bc7e69bbe41a5eeada Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -19,7 +19,7 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 13f85d5..e395704 100644
index 568072f..cc6c003 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -811,28 +811,18 @@ public class CraftWorld implements World {
@ -91,7 +91,7 @@ index 13f85d5..e395704 100644
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;
@ -132,7 +132,7 @@ index 13f85d5..e395704 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 a05f656..bec510a 100644
index a05f656..141391a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1343,6 +1343,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -167,7 +167,7 @@ index a05f656..bec510a 100644
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;

8
CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch
View File

@ -1,14 +1,14 @@
From c23721d38a84ae8cfbdae9374b4640409979aad4 Mon Sep 17 00:00:00 2001
From 0be8e93c32cc99e8db29392abc26d3ef465957ce Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index afa789f..1755da2 100644
index 3227e8b..45265c2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1199,6 +1199,7 @@ public abstract class Entity implements ICommandListener {
@@ -1197,6 +1197,7 @@ public abstract class Entity implements ICommandListener {
nbttagcompound.setLong("WorldUUIDLeast", this.world.getDataManager().getUUID().getLeastSignificantBits());
nbttagcompound.setLong("WorldUUIDMost", this.world.getDataManager().getUUID().getMostSignificantBits());
nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
@ -16,7 +16,7 @@ index afa789f..1755da2 100644
// CraftBukkit end
if (this.getCustomName() != null && this.getCustomName().length() > 0) {
nbttagcompound.setString("CustomName", this.getCustomName());
@@ -1286,6 +1287,8 @@ public abstract class Entity implements ICommandListener {
@@ -1284,6 +1285,8 @@ public abstract class Entity implements ICommandListener {
if (this instanceof EntityLiving) {
EntityLiving entity = (EntityLiving) this;

6
CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch
View File

@ -1,14 +1,14 @@
From 8565af4935a9f8a438bacca374c5d4460a6ea368 Mon Sep 17 00:00:00 2001
From 94b7d826fa4e104889820c8d444bf8ffe8b495cf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d3ee73d..10f6210 100644
index eac5e3c..a0a1790 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1050,33 +1050,60 @@ public abstract class World implements IBlockAccess {
@@ -1052,33 +1052,60 @@ public abstract class World implements IBlockAccess {
int i1 = MathHelper.floor(axisalignedbb.c);
int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);

12
CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From 9b567653a5ac2657bce8dbed472768f6f7bbd311 Mon Sep 17 00:00:00 2001
From 588c3ffb97bfb1db52719d708480c333314ba895 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions
@ -7,10 +7,10 @@ Limit a single entity to colliding a max of configurable times per tick.
This will alleviate issues where living entities are hoarded in 1x1 pens.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fd7c615..d6c8be8 100644
index 1339fd2..94a997f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1060,6 +1060,7 @@ public abstract class Entity implements ICommandListener {
@@ -1058,6 +1058,7 @@ public abstract class Entity implements ICommandListener {
public void d(EntityHuman entityhuman) {}
@ -19,10 +19,10 @@ index fd7c615..d6c8be8 100644
if (entity.passenger != this && entity.vehicle != this) {
if (!entity.T && !this.T) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6358f5e..9604034 100644
index 2d14a0d..807d5fa 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1617,7 +1617,9 @@ public abstract class EntityLiving extends Entity {
@@ -1626,7 +1626,9 @@ public abstract class EntityLiving extends Entity {
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
if (this.ad() && list != null && !list.isEmpty()) { // Spigot: Add this.ad() condition
@ -32,7 +32,7 @@ index 6358f5e..9604034 100644
Entity entity = (Entity) list.get(i);
// TODO better check now?
@@ -1628,9 +1630,12 @@ public abstract class EntityLiving extends Entity {
@@ -1637,9 +1639,12 @@ public abstract class EntityLiving extends Entity {
// CraftBukkit end
if (entity.ae()) {

8
CraftBukkit-Patches/0094-Guard-Entity-List.patch
View File

@ -1,11 +1,11 @@
From 352f7f79e63fef67ea3a162234805ff1bb9d4b7a Mon Sep 17 00:00:00 2001
From 95eac1a2131a07f4e646b0b8125bf2bf9b847859 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 09:03:28 +1100
Subject: [PATCH] Guard Entity List
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 10f6210..d2168c6 100644
index a0a1790..9c2ae28 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -33,7 +33,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@ -50,7 +50,7 @@ index 10f6210..d2168c6 100644
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
@@ -1293,6 +1319,7 @@ public abstract class World implements IBlockAccess {
@@ -1295,6 +1321,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@ -58,7 +58,7 @@ index 10f6210..d2168c6 100644
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1329,12 +1356,15 @@ public abstract class World implements IBlockAccess {
@@ -1331,12 +1358,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}

8
CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch
View File

@ -1,4 +1,4 @@
From 8166c17bd5628962813018cbd3f08e0e9f00403d Mon Sep 17 00:00:00 2001
From 31ece3ba767483b20a8bdcb00575610aff2f84f1 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,10 +6,10 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d2168c6..f0cf82d 100644
index 9c2ae28..0f4b93e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1044,6 +1044,7 @@ public abstract class World implements IBlockAccess {
@@ -1046,6 +1046,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
@ -17,7 +17,7 @@ index d2168c6..f0cf82d 100644
int i = entity.ae;
int j = entity.ag;
@@ -1060,6 +1061,7 @@ public abstract class World implements IBlockAccess {
@@ -1062,6 +1063,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end

6
CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View File

@ -1,11 +1,11 @@
From fb0f1a4889a2c32c2f1bd436ce192c68fcb58776 Mon Sep 17 00:00:00 2001
From 8debbd894791191ca811c1ca5b1627e43ff94da6 Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f0cf82d..3d45061 100644
index 0f4b93e..f75856e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -131,6 +131,8 @@ public abstract class World implements IBlockAccess {
@ -17,7 +17,7 @@ index f0cf82d..3d45061 100644
public static long chunkToKey(int x, int z)
{
@@ -531,6 +533,9 @@ public abstract class World implements IBlockAccess {
@@ -533,6 +535,9 @@ public abstract class World implements IBlockAccess {
}
// CraftBukkit end
iblockdata.getBlock().doPhysics(this, blockposition, iblockdata, block);

10
CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View File

@ -1,11 +1,11 @@
From 5c6d9448aa5bf7b1eaf8817382d43486a91a6a8c Mon Sep 17 00:00:00 2001
From 7a40b9cd24db374ee1139d61ac092f7e559aec18 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 9d09404..7ae68bb 100644
index a6b72d8..0f5d09b 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -6,6 +6,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -16,7 +16,7 @@ index 9d09404..7ae68bb 100644
public EntityOcelot(World world) {
super(world);
@@ -226,7 +227,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -231,7 +232,7 @@ public class EntityOcelot extends EntityTameableAnimal {
public GroupDataEntity prepare(DifficultyDamageScaler difficultydamagescaler, GroupDataEntity groupdataentity) {
groupdataentity = super.prepare(difficultydamagescaler, groupdataentity);
@ -26,7 +26,7 @@ index 9d09404..7ae68bb 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2322a96..ffa7e24 100644
index 69cb88d..2f34a01 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1071,6 +1071,12 @@ public class CraftWorld implements World {
@ -43,5 +43,5 @@ index 2322a96..ffa7e24 100644
((EntityInsentient) entity).prepare(getHandle().E(new BlockPosition(entity)), (GroupDataEntity) null);
}
--
1.9.1
2.1.0

6
CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch
View File

@ -1,14 +1,14 @@
From 17b049ba64de3c6f72ba6c082ff59ab60e75c577 Mon Sep 17 00:00:00 2001
From f3a54462ee2f5638daa4c1d62e6818db1584d6bb Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Thu, 26 Jun 2014 18:37:29 -0400
Subject: [PATCH] Fix Null Tile Entity Worlds
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3d45061..f441c84 100644
index f75856e..264f369 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1872,6 +1872,7 @@ public abstract class World implements IBlockAccess {
@@ -1874,6 +1874,7 @@ public abstract class World implements IBlockAccess {
}
}

12
CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch
View File

@ -1,4 +1,4 @@
From 2961d7b5e91f52bd3e24ecf1125e90d9155b68f3 Mon Sep 17 00:00:00 2001
From cc94cf5d70dccd9b10203df3f4745b28527622e4 Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Sat, 19 Apr 2014 16:58:26 -0400
Subject: [PATCH] Alternative Hopper Ticking
@ -45,7 +45,7 @@ index cc3e340..9a6ecbb 100644
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index e664e55..858e12c 100644
index 1412616..9d52a3d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -763,6 +763,11 @@ public class Chunk {
@ -126,7 +126,7 @@ index ee24008..ffc5ccb 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 7ae68bb..2627745 100644
index 0f5d09b..9260f2b 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -30,6 +30,31 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -370,7 +370,7 @@ index 280d64f..5355532 100644
public boolean o() {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f441c84..eb5b1db 100644
index 264f369..7b2621c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -133,6 +133,7 @@ public abstract class World implements IBlockAccess {
@ -425,7 +425,7 @@ index f441c84..eb5b1db 100644
// Spigot end
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@@ -385,6 +423,14 @@ public abstract class World implements IBlockAccess {
@@ -387,6 +425,14 @@ public abstract class World implements IBlockAccess {
// Modularize client and physic updates
notifyAndUpdatePhysics(blockposition, chunk, block1, block, i);
}
@ -440,7 +440,7 @@ index f441c84..eb5b1db 100644
// CraftBukkit end
return true;
@@ -1385,6 +1431,7 @@ public abstract class World implements IBlockAccess {
@@ -1387,6 +1433,7 @@ public abstract class World implements IBlockAccess {
}
// CraftBukkit end

6
CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch
View File

@ -1,4 +1,4 @@
From c938d89461ea977f4787b37f17c1bc774005b0a6 Mon Sep 17 00:00:00 2001
From eca4eae03ad12a47dd96990dd8e8951007a1ebf5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 8 Aug 2014 19:57:03 +1000
Subject: [PATCH] Plug WorldMap Memory Leak
@ -25,10 +25,10 @@ index 6bae818..a4e5294 100644
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 76340f6..b6221c6 100644
index 7b2621c..9bcbba6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1081,6 +1081,23 @@ public abstract class World implements IBlockAccess {
@@ -1083,6 +1083,23 @@ public abstract class World implements IBlockAccess {
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);