EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.3.4'

Browse Source 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
This commit is contained in:
MattBDev 2016-05-11 16:45:17 -04:00
commit 63472ebeaf
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/build.gradle
View File

@ -1,6 +1,6 @@
dependencies { dependencies {
compile project(':Core') compile project(':Core')
compile 'org.bukkit:bukkit:1.9-R0.1-SNAPSHOT' compile 'org.bukkit:bukkit:1.9.2-R0.1-SNAPSHOT'
compile 'org.mcstats.bukkit:metrics:R7' compile 'org.mcstats.bukkit:metrics:R7'
compile 'net.milkbowl.vault:VaultAPI:1.6' compile 'net.milkbowl.vault:VaultAPI:1.6'
} }

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
View File

@ -52,6 +52,11 @@ public class SendChunk {
RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk"); RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
//TODO in 1.7.10 this is PacketPlayOutMapChunk(Chunk chunk, boolean flag, int i, int version) //TODO in 1.7.10 this is PacketPlayOutMapChunk(Chunk chunk, boolean flag, int i, int version)
this.mapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class); this.mapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class);
if (PS.get().checkVersion(PS.get().IMP.getServerVersion(), 1, 9, 4)) {
this.mapChunk = classMapChunk.getConstructor(classChunk.getRealClass(),int.class);
} else {
this.mapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class);
}
RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer"); RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
this.connection = classEntityPlayer.getField("playerConnection"); this.connection = classEntityPlayer.getField("playerConnection");
RefClass classPacket = getRefClass("{nms}.Packet"); RefClass classPacket = getRefClass("{nms}.Packet");
@ -106,7 +111,12 @@ public class SendChunk {
Object c = this.methodGetHandleChunk.of(chunk).call(); Object c = this.methodGetHandleChunk.of(chunk).call();
chunks.remove(chunk); chunks.remove(chunk);
Object con = this.connection.of(entity).get(); Object con = this.connection.of(entity).get();
Object packet = this.mapChunk.create(c, true, 65535); Object packet;
if (PS.get().checkVersion(PS.get().IMP.getServerVersion(), 1, 9, 4)) {
packet = this.mapChunk.create(c,65535);
} else {
packet = this.mapChunk.create(c, true, 65535);
}
this.send.of(con).call(packet); this.send.of(con).call(packet);
} }
} }