Commits

md_5 authored 3d850ecdfb0 
Rebuild patches
No tags
7129aebca83
master

CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch

Modified
1 -From e03776b01c514d620b7fb4f260e23af9b73d530c Mon Sep 17 00:00:00 2001
1 +From 02a17780129e737e4a2f6e193e25f57f1fc29e29 Mon Sep 17 00:00:00 2001
2 2 From: md_5 <md_5@live.com.au>
3 3 Date: Sun, 2 Jun 2013 15:10:56 +1000
4 4 Subject: [PATCH] Skeleton API Implementations
5 5 ​
6 6 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
7 7 ​
8 8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
9 -index 9f404c1a..59828862 100644
9 +index c0ebdf1a8..314ce9a31 100644
10 10 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11 11 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12 -@@ -1695,4 +1695,14 @@ public final class CraftServer implements Server {
12 +@@ -1688,4 +1688,14 @@ public final class CraftServer implements Server {
13 13 public UnsafeValues getUnsafe() {
14 14 return CraftMagicNumbers.INSTANCE;
15 15 }
16 16 +
17 17 + private final Spigot spigot = new Spigot()
18 18 + {
19 19 +
20 20 + };
21 21 +
22 22 + public Spigot spigot()
23 23 + {
24 24 + return spigot;
25 25 + }
26 26 }
27 27 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
28 -index 1941e3a2..d1eb1e8f 100644
28 +index 1941e3a20..d1eb1e8f4 100644
29 29 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
30 30 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
31 31 @@ -1557,4 +1557,14 @@ public class CraftWorld implements World {
32 32 cps.unload(chunk);
33 33 }
34 34 }
35 35 + // Spigot start
36 36 + private final Spigot spigot = new Spigot()
37 37 + {
38 38 + };
39 39 +
40 40 + public Spigot spigot()
41 41 + {
42 42 + return spigot;
43 43 + }
44 44 + // Spigot end
45 45 }
46 46 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
47 -index 9acd92c3..8ae85a92 100644
47 +index 9acd92c35..8ae85a925 100644
48 48 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
49 49 +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
50 50 @@ -123,4 +123,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
51 51 getCaller().setOp(value);
52 52 }
53 53
54 54 + // Spigot start
55 55 + @Override
56 56 + public Spigot spigot()
57 57 + {
58 58 + return getCaller().spigot();
59 59 + }
60 60 + // Spigot end
61 61 }
62 62 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
63 -index 1314c744..a461a935 100644
63 +index 1314c744b..a461a935b 100644
64 64 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
65 65 +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
66 66 @@ -68,4 +68,16 @@ public abstract class ServerCommandSender implements CommandSender {
67 67 public Server getServer() {
68 68 return Bukkit.getServer();
69 69 }
70 70 +
71 71 + // Spigot start
72 72 + private final Spigot spigot = new Spigot()
73 73 + {
74 74 + };
75 75 +
76 76 + @Override
77 77 + public Spigot spigot()
78 78 + {
79 79 + return spigot;
80 80 + }
81 81 + // Spigot end
82 82 }
83 83 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
84 -index 0e1d9343..f9cd769e 100644
84 +index 0e1d93432..f9cd769ed 100644
85 85 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
86 86 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
87 87 @@ -83,4 +83,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
88 88 public void _INVALID_setShooter(LivingEntity shooter) {
89 89 getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
90 90 }
91 91 +
92 92 + // Spigot start
93 93 + private final Arrow.Spigot spigot = new Arrow.Spigot()
94 94 + {
95 95 + };
96 96 +
97 97 + public Arrow.Spigot spigot()
98 98 + {
99 99 + return spigot;
100 100 + }
101 101 + // Spigot end
102 102 }
103 103 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
104 -index 7739a3e4..938deeff 100644
104 +index 27ae8475a..bc2fa3cf1 100644
105 105 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
106 106 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
107 107 @@ -720,4 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
108 108 }
109 109 return perm;
110 110 }
111 111 +
112 112 + // Spigot start
113 113 + private final Spigot spigot = new Spigot()
114 114 + {
115 115 + };
116 116 +
117 117 + public Spigot spigot()
118 118 + {
119 119 + return spigot;
120 120 + }
121 121 + // Spigot end
122 122 }
123 123 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
124 -index 64e346d8..194d830e 100644
124 +index 64e346d84..194d830e1 100644
125 125 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
126 126 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
127 127 @@ -27,4 +27,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
128 128 public EntityType getType() {
129 129 return EntityType.LIGHTNING;
130 130 }
131 131 +
132 132 + // Spigot start
133 133 + private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() {
134 134 +
135 135 + };
136 136 +
137 137 + @Override
138 138 + public LightningStrike.Spigot spigot() {
139 139 + return spigot;
140 140 + }
141 141 + // Spigot end
142 142 }
143 143 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
144 -index b400b535..aebb7725 100644
144 +index 9747a8866..4db27bf9f 100644
145 145 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
146 146 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
147 -@@ -1480,4 +1480,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
147 +@@ -1479,4 +1479,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
148 148 public String getLocale() {
149 149 return getHandle().locale;
150 150 }
151 151 +
152 152 + // Spigot start
153 153 + private final Player.Spigot spigot = new Player.Spigot()
154 154 + {
155 155 + };
156 156 +
157 157 + public Player.Spigot spigot()
158 158 + {
159 159 + return spigot;
160 160 + }
161 161 + // Spigot end
162 162 }
163 163 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
164 -index 8d82c4dc..c071b7cb 100644
164 +index 8d82c4dca..c071b7cb9 100644
165 165 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
166 166 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
167 167 @@ -907,4 +907,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
168 168 return HANDLED_TAGS;
169 169 }
170 170 }
171 171 +
172 172 + // Spigot start
173 173 + private final Spigot spigot = new Spigot()
174 174 + {

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut