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

[Cosmetic] Update patches to be generated with latest stable git.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-10 12:36:11 +10:00
parent c35e70ad7d
commit b8055fe033
45 changed files with 337 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
View File

@@ -1,21 +1,21 @@
From c9c8a4745f0652ba8cd5e0f89e6ee90677036845 Mon Sep 17 00:00:00 2001
From 7c7fc1b2b48f008dd2ad6f2bc0ba304a9cf10503 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions
Fix issues when specifiying a server texture pack URL with resolution != 16.
---
.../java/net/minecraft/server/MinecraftServer.java | 2 +-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 ++
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
src/main/resources/configurations/bukkit.yml | 1 +
src/main/java/net/minecraft/server/MinecraftServer.java | 2 +-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 2 ++
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
src/main/resources/configurations/bukkit.yml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 168394f..3b2d9d3 100644
index 4a9d711..8e02ca4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1073,7 +1073,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -1075,7 +1075,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public int S() {
@@ -25,7 +25,7 @@ index 168394f..3b2d9d3 100644
public abstract boolean T();
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 49092c7..121b5ba 100644
index b5953ce..504bd8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -24,6 +24,7 @@ public class Spigot {
@@ -45,10 +45,10 @@ index 49092c7..121b5ba 100644
if (metrics == null) {
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8eb93c0..f9a7645 100644
index a913a1c..10bfb8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -828,7 +828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -830,7 +830,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setTexturePack(String url) {
Validate.notNull(url, "Texture pack URL cannot be null");
@@ -70,5 +70,5 @@ index df8dfaa..bc0b044 100644
default:
growth-chunks-per-tick: 650
--
1.7.0.4
1.8.2.1