twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Stage 1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-12 14:18:37 +10:00
parent e8dcebdcd5
commit 28ccca81f4
113 changed files with 5701 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b89dc9528c1550605eb17523a2789b50e7ae2ac7 Mon Sep 17 00:00:00 2001
From 4507c064694b49ed2a2e7594d0efe82e882c5f8d 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
@@ -26,7 +26,7 @@ index 51f8279..aaead32 100644
public int a(Random random) {
return 1;
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index af440b9..8f291c2 100644
index 1af0e67..70b0181 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -91,6 +91,7 @@ public class EntityTracker {
@@ -66,10 +66,10 @@ index c148c4d..a2b54a4 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 d023889..19654b4 100644
index edf229b..146285f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -900,6 +900,7 @@ public abstract class World implements IBlockAccess {
@@ -901,6 +901,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -77,7 +77,7 @@ index d023889..19654b4 100644
if (entity == null) return false;
// CraftBukkit end
@@ -1006,6 +1007,7 @@ public abstract class World implements IBlockAccess {
@@ -1007,6 +1008,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@@ -85,7 +85,7 @@ index d023889..19654b4 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2390,6 +2392,7 @@ public abstract class World implements IBlockAccess {
@@ -2391,6 +2393,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@@ -122,10 +122,10 @@ index d9fbd00..bfa8c23 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 3fbbb06..3fee3e8 100644
index c1d3118..8a09d97 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -232,6 +232,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@@ -169,5 +169,5 @@ index 0000000..4b3aa85
+ }
+}
--
1.8.5.2.msysgit.0
1.8.3.2