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

Fix some stuff

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-12 14:27:04 +10:00
parent c47da724d4
commit c3fd1723b1
38 changed files with 51 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0002-mc-dev-imports.patch
View File

@@ -1,4 +1,4 @@
From d1cf8a682f9fe9a4a32f7590869243c259db4461 Mon Sep 17 00:00:00 2001
From 6fd3d3a404c44bdb8aac56011d38dc5ff8a07ff8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
@@ -769,7 +769,7 @@ index 0000000..e943676
+}
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
new file mode 100644
index 0000000..4c21643
index 0000000..2676e9e
--- /dev/null
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -0,0 +1,94 @@
@@ -811,7 +811,7 @@ index 0000000..4c21643
+ this.a(new CommandSetBlock());
+ this.a(new CommandTestForBlock());
+ this.a(new CommandTellRaw());
+ if (MinecraftServer.getServer().W()) {
+ if (MinecraftServer.getServer().X()) {
+ this.a(new CommandOp());
+ this.a(new CommandDeop());
+ this.a(new CommandStop());
@@ -852,7 +852,7 @@ index 0000000..4c21643
+ while (iterator.hasNext()) {
+ EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+
+ if (entityplayer != icommandlistener && MinecraftServer.getServer().getPlayerList().isOp(entityplayer.getName()) && icommand.canUse(entityplayer) && (!(icommandlistener instanceof RemoteControlCommandListener) || MinecraftServer.getServer().m())) {
+ if (entityplayer != icommandlistener && MinecraftServer.getServer().getPlayerList().isOp(entityplayer.getProfile()) && icommand.canUse(entityplayer) && (!(icommandlistener instanceof RemoteControlCommandListener) || MinecraftServer.getServer().m())) {
+ entityplayer.sendMessage(chatmessage);
+ }
+ }
@@ -2178,7 +2178,7 @@ index 0000000..d7d93a0
+}
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
new file mode 100644
index 0000000..0becb94
index 0000000..819896f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -0,0 +1,202 @@
@@ -2246,7 +2246,7 @@ index 0000000..0becb94
+ this.e.add(statistic);
+ if (statistic.d() && j == 0 && i > 0) {
+ this.g = true;
+ if (this.c.as()) {
+ if (this.c.at()) {
+ this.c.getPlayerList().sendMessage(new ChatMessage("chat.type.achievement", new Object[] { entityhuman.getScoreboardDisplayName(), statistic.j()}));
+ }
+ }
@@ -2347,7 +2347,7 @@ index 0000000..0becb94
+ }
+
+ public void a(EntityPlayer entityplayer) {
+ int i = this.c.ak();
+ int i = this.c.al();
+ HashMap hashmap = Maps.newHashMap();
+
+ if (this.g || i - this.f > 300) {
@@ -2767,5 +2767,5 @@ index 0000000..c0db754
+ }
+}
--
1.8.5.2.msysgit.0
1.8.3.2