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

More stuff

This commit is contained in:
md_5 2013-12-01 16:00:50 +11:00
parent 0e6412942d
commit 233e23603a
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 05fb18bad02b47254f06de1d117946b509454305 Mon Sep 17 00:00:00 2001 From b534c64219838baa8bf4a35daa5a69e4ba414c3e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100 Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities 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 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2e03b42..d89ef3c 100644 index 7f8d224..60c78d2 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1313,6 +1313,13 @@ public abstract class World implements IBlockAccess { @@ -1305,6 +1305,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) { while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next(); TileEntity tileentity = (TileEntity) iterator.next();

14
CraftBukkit-Patches/0020-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From c501d75e14fe07c06bee42ce7781d2c873b5970b Mon Sep 17 00:00:00 2001 From a748467688abd31e2a1fee9f5f2e5339ff99c5b2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500 Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range Subject: [PATCH] Entity Activation Range
@ -116,10 +116,10 @@ index 75b1ec1..a61001d 100644
public EntityLiving(World world) { public EntityLiving(World world) {
super(world); super(world);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d89ef3c..f53e51d 100644 index 60c78d2..3108628 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1255,6 +1255,7 @@ public abstract class World implements IBlockAccess { @@ -1247,6 +1247,7 @@ public abstract class World implements IBlockAccess {
this.f.clear(); this.f.clear();
this.methodProfiler.c("regular"); this.methodProfiler.c("regular");
@ -127,7 +127,7 @@ index d89ef3c..f53e51d 100644
timings.entityTick.startTiming(); // Spigot timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) { for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i); entity = (Entity) this.entityList.get(i);
@@ -1415,7 +1416,11 @@ public abstract class World implements IBlockAccess { @@ -1407,7 +1408,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ); int j = MathHelper.floor(entity.locZ);
byte b0 = 32; byte b0 = 32;
@ -156,7 +156,7 @@ index 8340c13..541dfe4 100644
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>(); public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
new file mode 100644 new file mode 100644
index 0000000..9285a0d index 0000000..db4c927
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,296 @@ @@ -0,0 +1,296 @@
@ -396,14 +396,14 @@ index 0000000..9285a0d
+ { + {
+ return true; + return true;
+ } + }
+ if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bU() /* Getter for first boolean */ ) + if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bY() /* Getter for first boolean */ )
+ { + {
+ return true; + return true;
+ } + }
+ if ( entity instanceof EntityAnimal ) + if ( entity instanceof EntityAnimal )
+ { + {
+ EntityAnimal animal = (EntityAnimal) entity; + EntityAnimal animal = (EntityAnimal) entity;
+ if ( animal.isBaby() || animal.bY() /*love*/ ) + if ( animal.isBaby() || animal.cc() /*love*/ )
+ { + {
+ return true; + return true;
+ } + }

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

@ -1,4 +1,4 @@
From dfcebcb9344ef7922d9ab62754ab1f7699948ddc Mon Sep 17 00:00:00 2001 From 79bffbcd6957abfa4770f25175d370f0363de1b5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100 Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved Ping Sending Subject: [PATCH] Enable Improved Ping Sending
@ -17,7 +17,7 @@ index 42fa9e0..af08d2f 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index df28a59..ad3c3cf 100644 index df28a59..b71ee29 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -765,6 +765,25 @@ public abstract class PlayerList { @@ -765,6 +765,25 @@ public abstract class PlayerList {
@ -31,7 +31,7 @@ index df28a59..ad3c3cf 100644
+ EntityPlayer player = (EntityPlayer) this.players.get( index ); + EntityPlayer player = (EntityPlayer) this.players.get( index );
+ if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 ) + if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 )
+ { + {
+ Packet packet = new Packet201PlayerInfo( player.listName, true, player.ping ); + Packet packet = new PacketPlayOutPlayerInfo( player.listName, true, player.ping );
+ for ( EntityPlayer splayer : (List<EntityPlayer>) this.players ) + for ( EntityPlayer splayer : (List<EntityPlayer>) this.players )
+ { + {
+ if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) ) + if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) )

14
CraftBukkit-Patches/0030-Improve-NextTickList-Performance.patch
View File

@ -1,4 +1,4 @@
From e6404134e65bbc8cd3511970a0cfa38c98e54820 Mon Sep 17 00:00:00 2001 From c6765742b160b32e27b3a77a060f5eedd7e44335 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com> From: Mike Primm <mike@primmhome.com>
Date: Wed, 24 Apr 2013 01:43:33 -0500 Date: Wed, 24 Apr 2013 01:43:33 -0500
Subject: [PATCH] Improve NextTickList Performance Subject: [PATCH] Improve NextTickList Performance
@ -7,7 +7,7 @@ Improve next-tick-list performance on chunk unloads, large
queues queues
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
index acf8838..1e3e0f8 100644 index 06934a1..d90acfc 100644
--- a/src/main/java/net/minecraft/server/NextTickListEntry.java --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
+++ b/src/main/java/net/minecraft/server/NextTickListEntry.java +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
@@ -30,7 +30,7 @@ public class NextTickListEntry implements Comparable { @@ -30,7 +30,7 @@ public class NextTickListEntry implements Comparable {
@ -20,7 +20,7 @@ index acf8838..1e3e0f8 100644
public NextTickListEntry a(long i) { public NextTickListEntry a(long i) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 74a2d45..b860ce8 100644 index 74a2d45..3cf8a53 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -29,8 +29,8 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate @@ -29,8 +29,8 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@ -77,7 +77,7 @@ index 74a2d45..b860ce8 100644
+ int te_cnt = this.pendingTickEntries.size(); + int te_cnt = this.pendingTickEntries.size();
+ for (int idx = this.nextPendingTickEntry; idx < te_cnt; idx++) { + for (int idx = this.nextPendingTickEntry; idx < te_cnt; idx++) {
+ NextTickListEntry ent = this.pendingTickEntries.get(idx); + NextTickListEntry ent = this.pendingTickEntries.get(idx);
+ if ((ent.a == i) && (ent.b == j) && (ent.c == k) && Block.b(ent.d, l)) { + if ((ent.a == i) && (ent.b == j) && (ent.c == k) && Block.a(ent.a(), block)) {
+ return true; + return true;
+ } + }
+ } + }
@ -277,7 +277,7 @@ index 74a2d45..b860ce8 100644
+ } + }
+ +
+ private List<NextTickListEntry> getNextTickEntriesForChunk(Chunk chunk, boolean remove) { + private List<NextTickListEntry> getNextTickEntriesForChunk(Chunk chunk, boolean remove) {
+ long coord = LongHash.toLong(chunk.x, chunk.z); + long coord = LongHash.toLong(chunk.locX, chunk.locZ);
+ Set<NextTickListEntry> chunkset = this.tickEntriesByChunk.get(coord); + Set<NextTickListEntry> chunkset = this.tickEntriesByChunk.get(coord);
+ List<NextTickListEntry> list = null; + List<NextTickListEntry> list = null;
+ if (chunkset != null) { + if (chunkset != null) {
@ -290,9 +290,9 @@ index 74a2d45..b860ce8 100644
+ } + }
+ // See if any on list of ticks being processed now + // See if any on list of ticks being processed now
+ if (this.nextPendingTickEntry < this.pendingTickEntries.size()) { + if (this.nextPendingTickEntry < this.pendingTickEntries.size()) {
+ int xmin = (chunk.x << 4); + int xmin = (chunk.locX << 4);
+ int xmax = xmin + 16; + int xmax = xmin + 16;
+ int zmin = (chunk.z << 4); + int zmin = (chunk.locZ << 4);
+ int zmax = zmin + 16; + int zmax = zmin + 16;
+ int te_cnt = this.pendingTickEntries.size(); + int te_cnt = this.pendingTickEntries.size();
+ for (int i = this.nextPendingTickEntry; i < te_cnt; i++) { + for (int i = this.nextPendingTickEntry; i < te_cnt; i++) {

6
CraftBukkit-Patches/0033-Implement-Arrow-API.patch
View File

@ -1,11 +1,11 @@
From ffd15463a41ddcbb6aebe9c6cff9664be5ddd804 Mon Sep 17 00:00:00 2001 From 6c8390877aaed73c733652eb830e72744c43bb22 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000 Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API Subject: [PATCH] Implement Arrow API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index a386001..e976b83 100644 index a386001..236384f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -44,6 +44,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow { @@ -44,6 +44,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
@ -15,7 +15,7 @@ index a386001..e976b83 100644
+ @Override + @Override
+ public double getDamage() + public double getDamage()
+ { + {
+ return getHandle().c(); + return getHandle().e();
+ } + }
+ +
+ @Override + @Override

6
CraftBukkit-Patches/0034-Hopper-Cooldowns.patch
View File

@ -1,11 +1,11 @@
From 9517fbacec37f55447c78c4eb0d188416e7133ba Mon Sep 17 00:00:00 2001 From a02b41b4296596e8b03203f630a33f9a7f1e83b7 Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org> From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700 Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Cooldowns Subject: [PATCH] Hopper Cooldowns
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 730eb78..7d17d37 100644 index 730eb78..a68b748 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -182,12 +182,17 @@ public class TileEntityHopper extends TileEntity implements IHopper { @@ -182,12 +182,17 @@ public class TileEntityHopper extends TileEntity implements IHopper {
@ -20,7 +20,7 @@ index 730eb78..7d17d37 100644
} }
- -
+ // Spigot start + // Spigot start
+ if ( !this.l() ) + if ( !this.j() )
+ { + {
+ this.c( world.spigotConfig.hopperCheck ); + this.c( world.spigotConfig.hopperCheck );
+ } + }