Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-30 05:53:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/craftaro/SongodaCore into development

Browse Source
This commit is contained in:
ceze88 2024-07-10 19:05:48 +02:00
commit c3cd6baf49
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Compatibility/src/main/java/com/craftaro/core/compatibility/CompatibleParticleHandler.java
View File

@ -133,7 +133,7 @@ public class CompatibleParticleHandler {
} }
ParticleType() { ParticleType() {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
this.compatibilityMode = true; this.compatibilityMode = true;
this.particle = null; this.particle = null;
this.compatibleEffect = LegacyParticleEffects.Type.valueOf(name()); this.compatibleEffect = LegacyParticleEffects.Type.valueOf(name());
@ -154,7 +154,7 @@ public class CompatibleParticleHandler {
ParticleType(ServerVersion minVersion, String compatible) { ParticleType(ServerVersion minVersion, String compatible) {
// Particle class doesn't exist in 1.8 // Particle class doesn't exist in 1.8
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
this.compatibilityMode = true; this.compatibilityMode = true;
this.compatibleEffect = LegacyParticleEffects.Type.valueOf(compatible); this.compatibleEffect = LegacyParticleEffects.Type.valueOf(compatible);
this.particle = null; this.particle = null;
@ -201,7 +201,7 @@ public class CompatibleParticleHandler {
} }
public static void spawnParticles(ParticleType type, Location location) { public static void spawnParticles(ParticleType type, Location location) {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
LegacyParticleEffects.createParticle(location, type.compatibleEffect); LegacyParticleEffects.createParticle(location, type.compatibleEffect);
} else { } else {
location.getWorld().spawnParticle((Particle) type.particle, location, 0); location.getWorld().spawnParticle((Particle) type.particle, location, 0);
@ -209,7 +209,7 @@ public class CompatibleParticleHandler {
} }
public static void spawnParticles(ParticleType type, Location location, int count) { public static void spawnParticles(ParticleType type, Location location, int count) {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
float xx = (float) (1 * (Math.random() - Math.random())); float xx = (float) (1 * (Math.random() - Math.random()));
float yy = (float) (1 * (Math.random() - Math.random())); float yy = (float) (1 * (Math.random() - Math.random()));
@ -224,7 +224,7 @@ public class CompatibleParticleHandler {
} }
public static void spawnParticles(ParticleType type, Location location, int count, double offsetX, double offsetY, double offsetZ) { public static void spawnParticles(ParticleType type, Location location, int count, double offsetX, double offsetY, double offsetZ) {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
float xx = (float) (offsetX * (Math.random() - Math.random())); float xx = (float) (offsetX * (Math.random() - Math.random()));
float yy = (float) (offsetY * (Math.random() - Math.random())); float yy = (float) (offsetY * (Math.random() - Math.random()));
@ -242,7 +242,7 @@ public class CompatibleParticleHandler {
} }
public static void spawnParticles(ParticleType type, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, Player receiver) { public static void spawnParticles(ParticleType type, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, Player receiver) {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8)) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
float xx = (float) (offsetX * (Math.random() - Math.random())); float xx = (float) (offsetX * (Math.random() - Math.random()));
float yy = (float) (offsetY * (Math.random() - Math.random())); float yy = (float) (offsetY * (Math.random() - Math.random()));

2
Core/src/main/java/com/craftaro/core/gui/Gui.java
View File

@ -902,7 +902,7 @@ public class Gui {
return ""; return "";
} }
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_8) && title.length() > 32) { if (ServerVersion.isServerVersionBelow(ServerVersion.V1_9) && title.length() > 32) {
return title.charAt(30) == '§' ? title.substring(0, 30) : title.substring(0, 31); return title.charAt(30) == '§' ? title.substring(0, 30) : title.substring(0, 31);
} }