Skip to content

Commit 308e3d3

Browse files
committed
Update to 1.15.2
1 parent 42e48aa commit 308e3d3

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<project.fullVersion>${project.version}</project.fullVersion>
1818

1919
<powermock.version>2.0.4</powermock.version>
20-
<spigot.version>1.15.1-R0.1-SNAPSHOT</spigot.version>
20+
<spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
2121
</properties>
2222

2323
<build>

src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
import net.sf.cglib.proxy.MethodInterceptor;
3131
import net.sf.cglib.proxy.MethodProxy;
3232

33-
import org.bukkit.Bukkit;
34-
import org.bukkit.Location;
35-
import org.bukkit.OfflinePlayer;
36-
import org.bukkit.World;
33+
import org.bukkit.*;
34+
import org.bukkit.entity.EntityType;
3735
import org.bukkit.entity.Player;
3836

3937
import com.comphenix.protocol.utility.EnhancerFactory;
@@ -109,6 +107,50 @@ public Location getBedSpawnLocation() {
109107
return bedSpawnLocation;
110108
}
111109

110+
// TODO do we need to implement this?
111+
112+
public void incrementStatistic(Statistic statistic) throws IllegalArgumentException { }
113+
114+
public void decrementStatistic(Statistic statistic) throws IllegalArgumentException { }
115+
116+
public void incrementStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
117+
118+
public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
119+
120+
public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException { }
121+
122+
public int getStatistic(Statistic statistic) throws IllegalArgumentException {
123+
return 0;
124+
}
125+
126+
public void incrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException { }
127+
128+
public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException { }
129+
130+
public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
131+
return 0;
132+
}
133+
134+
public void incrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
135+
136+
public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
137+
138+
public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException { }
139+
140+
public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { }
141+
142+
public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException { }
143+
144+
public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
145+
return 0;
146+
}
147+
148+
public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException { }
149+
150+
public void decrementStatistic(Statistic statistic, EntityType entityType, int i) { }
151+
152+
public void setStatistic(Statistic statistic, EntityType entityType, int i) { }
153+
112154
@Override
113155
public long getFirstPlayed() {
114156
return firstPlayed;

src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ public void testPotionEffect() {
448448
int e = 0;
449449
if (effect.isAmbient()) e |= 1;
450450
if (effect.hasParticles()) e |= 2;
451-
if (mobEffect.f()) e |= 4;
451+
if (effect.hasIcon()) e |= 4;
452452

453453
assertEquals(e, (byte) packet.getBytes().read(2));
454454
}

0 commit comments

Comments
 (0)