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

Upstream merge

This commit is contained in:
md_5 2013-07-30 07:24:23 +10:00
parent 2fff7d15c5
commit 5462e4c2bb
5 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CraftBukkit

@ -1 +1 @@
Subproject commit 74f60d87ff8ba8bc47b9050b1da48d6daa203f15
Subproject commit 4176258a836062b22ac46919aefa5cc36fae78f2

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

@ -1,4 +1,4 @@
From c03134ec78557b243c61be2550a093a349ddfcd5 Mon Sep 17 00:00:00 2001
From d44ba655f20564580bf309ee402fb17e04224152 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
@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index a8e45dd..7f23f71 100644
index 1d9203b..ebbef6a 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -87,6 +87,7 @@ public class EntityTracker {
@ -26,7 +26,7 @@ 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 e05296c..dc251dd 100644
index 2a9dd2c..8c35cfe 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -297,6 +297,7 @@ public class EntityTrackerEntry {
@ -37,7 +37,7 @@ index e05296c..dc251dd 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -511,6 +512,7 @@ public class EntityTrackerEntry {
@@ -503,6 +504,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {

2
CraftBukkit-Patches/0064-Client-Crash-Cannot-Send-Message.patch → CraftBukkit-Patches/0063-Client-Crash-Cannot-Send-Message.patch
View File

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

24
CraftBukkit-Patches/0063-Fix-StructureGrowEvent.getPlayer.patch
View File

@ -1,24 +0,0 @@
From dca5c08d448139c00b6ed47389ebdd996b2c10df Mon Sep 17 00:00:00 2001
From: ItsHarry <info@itsjerryandharry.com>
Date: Wed, 10 Jul 2013 13:45:08 +0200
Subject: [PATCH] Fix StructureGrowEvent.getPlayer()
Fixes StructureGrowEvent.getPlayer(); always returning null regardless of whether
bonemeal was used or not.
diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index d0ffd84..3a98903 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -29,7 +29,7 @@ public class ItemDye extends Item {
return false;
} else {
if (itemstack.getData() == 15) {
- if (a(itemstack, world, i, j, k)) {
+ if (a(itemstack, world, i, j, k, entityhuman)) {
if (!world.isStatic) {
world.triggerEffect(2005, i, j, k, 0);
}
--
1.8.1.2

2
CraftBukkit-Patches/0065-Entity-ticking-chunk-caching.patch → CraftBukkit-Patches/0064-Entity-ticking-chunk-caching.patch
View File

@ -1,4 +1,4 @@
From 5fd90c3a39b60c85b663c32ea4cdfcadf48c135a Mon Sep 17 00:00:00 2001
From 214a039d5fcb2ce28c32e580f91de4e23005bd86 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching