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

Update to 1.5.1

Browse Source 
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
This commit is contained in:
Spigot
2013-03-20 21:54:12 +00:00
parent 9a3a09e79b
commit f370ab8784
46 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0002-Spigot-changes.patch
View File

@@ -1,4 +1,4 @@
From 3e3baa72093f845274f47c79673beccc1b081e35 Mon Sep 17 00:00:00 2001
From e487f4eb5d39d9f09a9ffa5dafa8354d94115169 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 16 Mar 2013 10:13:29 +1100
Subject: [PATCH] Spigot changes.
@@ -347,7 +347,7 @@ index ee775bf..aa8d83f 100644
if (!this.world.isStatic && this.age >= 6000) {
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 30259de..af42142 100644
index 58a8110..c000125 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -63,10 +63,6 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -407,7 +407,7 @@ index 13c2705..9ea4ee6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d57ff15..a435f67 100644
index 6efb5b6..79c52f6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -304,7 +304,7 @@ public abstract class PlayerList {
@@ -467,7 +467,7 @@ index 0686ba0..c185f64 100644
URL url = new URL("http://session.minecraft.net/game/checkserver.jsp?user=" + URLEncoder.encode(PendingConnection.d(this.pendingConnection), "UTF-8") + "&serverId=" + URLEncoder.encode(s, "UTF-8"));
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9c39815..67f2560 100644
index b694789..134ab73 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -67,14 +67,27 @@ public abstract class World implements IBlockAccess {
@@ -631,7 +631,7 @@ index 9c39815..67f2560 100644
double d0 = 0.25D;
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
@@ -1942,6 +2038,11 @@ public abstract class World implements IBlockAccess {
@@ -1946,6 +2042,11 @@ public abstract class World implements IBlockAccess {
this.worldData.setWeatherDuration(1);
}
@@ -643,7 +643,7 @@ index 9c39815..67f2560 100644
protected void A() {
// this.chunkTickList.clear(); // CraftBukkit - removed
this.methodProfiler.a("buildList");
@@ -1951,25 +2052,42 @@ public abstract class World implements IBlockAccess {
@@ -1955,25 +2056,42 @@ public abstract class World implements IBlockAccess {
int j;
int k;
@@ -700,7 +700,7 @@ index 9c39815..67f2560 100644
this.methodProfiler.b();
if (this.O > 0) {
@@ -1977,7 +2095,7 @@ public abstract class World implements IBlockAccess {
@@ -1981,7 +2099,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");
@@ -1225,5 +1225,5 @@ index 61a95e3..f44d5d0 100644
monsters: 70
animals: 15
--
1.8.1-rc2
1.8.2