SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a fair chunk of existing patches now applied to CraftBukkit

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-13 17:06:23 +10:00
parent a0c2b2a887
commit ece477d0c7
40 changed files with 116 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View File

@@ -1,4 +1,4 @@
From ae810f2bc90405ea57328770e9edb5425368f82c Mon Sep 17 00:00:00 2001
From e7fda7fe893f59f61e809a0bcd2552a9d67941e7 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 4de1273..db62084 100644
index 9e2b76f..d7efe3e 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -89,6 +89,7 @@ public class EntityTracker {
@@ -26,7 +26,7 @@ index 4de1273..db62084 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 4871bd7..8aa2e88 100644
index 65cc4e8..970a834 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -286,6 +286,7 @@ public class EntityTrackerEntry {
@@ -37,7 +37,7 @@ index 4871bd7..8aa2e88 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -470,6 +471,7 @@ public class EntityTrackerEntry {
@@ -474,6 +475,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
@@ -46,10 +46,10 @@ index 4871bd7..8aa2e88 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3d77400..92e8a37 100644
index f5730d3..af85d8b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -919,6 +919,7 @@ public abstract class World implements IBlockAccess {
@@ -918,6 +918,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -57,7 +57,7 @@ index 3d77400..92e8a37 100644
if (entity == null) return false;
// CraftBukkit end
@@ -1025,6 +1026,7 @@ public abstract class World implements IBlockAccess {
@@ -1024,6 +1025,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@@ -94,7 +94,7 @@ index a303090..f5e63f8 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 a93625c..5b74a5b 100644
index 8c30bf5..13532d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {