Update again - git isn't as smart as he looks

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-03 14:16:28 +10:00
parent bbcec2f9af
commit 70bd8275d1
4 changed files with 16 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
From 8e1fe60b678de75432cbd146c31eaa867ccf99aa Mon Sep 17 00:00:00 2001
From af557fd6f13fce2560eb4889cf556c88cc045298 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@@ -43,12 +43,12 @@ index b46b9c4..c91b12c 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 583b99c..1d97430 100644
index 977adff..5628d84 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -997,4 +997,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
@@ -1010,4 +1010,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isScaledHealth() {
return this.scaledHealth;
}
+
+ // Spigot start