Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit b4a54ec

Browse files
author
Tarek
committed
updated version string to 2.1.14.3 + fixed some bugs from Discord server bug reports channel
1 parent 37c0da7 commit b4a54ec

File tree

15 files changed

+53
-33
lines changed

15 files changed

+53
-33
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
}
1616
stage('Version') {
1717
steps {
18-
sh 'mvn versions:set -DnewVersion=2.1.14.2'
18+
sh 'mvn versions:set -DnewVersion=2.1.14.3'
1919
}
2020
}
2121
stage('Compile') {

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/BukkitBootstrap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void checkRegistryAccess()
105105
{
106106
Class.forName("net.md_5.bungee.api.chat.BaseComponent");
107107
Class.forName("de.dytanic.cloudnet.bridge.internal.chat.DocumentRegistry").getMethod("fire").invoke(null);
108-
} catch (Exception ex)
108+
} catch (Exception ignored)
109109
{
110110
}
111111
}

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/CloudProxy.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,14 @@ public void onServerRemove(ServerInfo serverInfo)
374374
if (serverInfo == null) return;
375375

376376
ProxyServer.getInstance().getPluginManager().callEvent(new ProxiedServerRemoveEvent(serverInfo));
377-
ProxyServer.getInstance().getServers().remove(serverInfo.getServiceId().getServerId());
377+
378+
try
379+
{
380+
ProxyServer.getInstance().getServers().remove(serverInfo.getServiceId().getServerId());
381+
} catch (Throwable ignored)
382+
{
383+
}
384+
378385
cachedServers.remove(serverInfo.getServiceId().getServerId());
379386

380387
if (serverInfo.getServiceId().getGroup().equalsIgnoreCase(getProxyGroup().getProxyConfig().getDynamicFallback().getDefaultFallback()))

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/bukkit/BukkitListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import de.dytanic.cloudnet.api.CloudAPI;
88
import de.dytanic.cloudnet.bridge.CloudServer;
99
import de.dytanic.cloudnet.bridge.event.bukkit.BukkitSubChannelMessageEvent;
10-
import de.dytanic.cloudnet.bridge.internal.util.CloudPermissble;
10+
import de.dytanic.cloudnet.bridge.internal.util.CloudPermissible;
1111
import de.dytanic.cloudnet.bridge.internal.util.ReflectionUtil;
1212
import de.dytanic.cloudnet.lib.player.CloudPlayer;
1313
import de.dytanic.cloudnet.lib.player.permission.GroupEntityData;
@@ -97,8 +97,8 @@ public void handleFirst(PlayerLoginEvent event)
9797
else field = Class.forName("net.glowstone.entity.GlowHumanEntity").getDeclaredField("permissions");
9898

9999
field.setAccessible(true);
100-
final CloudPermissble cloudPermissble = new CloudPermissble(event.getPlayer());
101-
field.set(event.getPlayer(), cloudPermissble);
100+
final CloudPermissible cloudPermissible = new CloudPermissible(event.getPlayer());
101+
field.set(event.getPlayer(), cloudPermissible);
102102
} catch (Exception ex)
103103
{
104104
ex.printStackTrace();

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissble.java renamed to ‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
/**
2121
* Created by Tareko on 18.08.2017.
2222
*/
23-
public class CloudPermissble extends PermissibleBase {
23+
public class CloudPermissible extends PermissibleBase {
2424

2525
private UUID uniqueId;
2626

27-
public CloudPermissble(Player player)
27+
public CloudPermissible(Player player)
2828
{
2929
super(player);
3030
this.uniqueId = player.getUniqueId();

‎cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void removeProxy(ProxyProcessMeta proxyServer, CloudFlareDatabase cloudFl
185185

186186
while (true)
187187
{
188-
MultiValue<PostResponse, String> postResponse = CollectionWrapper.filter(bungeeSRVRecords.values(), new Acceptable<MultiValue<PostResponse, String>>() {
188+
Collection<MultiValue<PostResponse, String>> postResponses = CollectionWrapper.filterMany(bungeeSRVRecords.values(), new Acceptable<MultiValue<PostResponse, String>>() {
189189
@Override
190190
public boolean isAccepted(MultiValue<PostResponse, String> postResponseStringMultiValue)
191191
{
@@ -194,11 +194,23 @@ public boolean isAccepted(MultiValue<PostResponse, String> postResponseStringMul
194194
});
195195

196196
//MultiValue<PostResponse, String> postResponse = bungeeSRVRecords.get(proxyServer.getServiceId().getServerId());
197+
/*
197198
if (postResponse != null)
198199
{
199200
cloudFlareDatabase.remove(postResponse.getFirst().getId());
200201
deleteRecord(postResponse.getFirst());
201202
} else break;
203+
*/
204+
205+
for (MultiValue<PostResponse, String> postResponse : postResponses)
206+
if (postResponse != null)
207+
{
208+
bungeeSRVRecords.remove(postResponse.getSecond());
209+
cloudFlareDatabase.remove(postResponse.getFirst().getId());
210+
deleteRecord(postResponse.getFirst());
211+
212+
NetworkUtils.sleepUninterruptedly(500);
213+
}
202214
}
203215
}
204216

@@ -223,6 +235,7 @@ public PostResponse createRecord(CloudFlareConfig cloudFlareConfig, DNSRecord dn
223235
httpPost.setRequestProperty("Content-Type", "application/json");
224236
httpPost.setDoOutput(true);
225237
httpPost.connect();
238+
226239
try (DataOutputStream dataOutputStream = new DataOutputStream(httpPost.getOutputStream()))
227240
{
228241
dataOutputStream.writeBytes(values);
@@ -260,12 +273,14 @@ public void deleteRecord(PostResponse postResponse)
260273
try
261274
{
262275
HttpURLConnection delete = (HttpURLConnection) new URL(PREFIX_URL + "zones/" + postResponse.getCloudFlareConfig().getZoneId() + "/dns_records/" + postResponse.getId()).openConnection();
276+
263277
delete.setRequestMethod("DELETE");
264278
delete.setRequestProperty("X-Auth-Email", postResponse.getCloudFlareConfig().getEmail());
265279
delete.setRequestProperty("X-Auth-Key", postResponse.getCloudFlareConfig().getToken());
266280
delete.setRequestProperty("Accept", "application/json");
267281
delete.setRequestProperty("Content-Type", "application/json");
268282
delete.connect();
283+
269284
try (InputStream inputStream = delete.getInputStream())
270285
{
271286
JsonObject jsonObject = toJsonInput(inputStream);
@@ -274,6 +289,7 @@ public void deleteRecord(PostResponse postResponse)
274289
System.out.println(prefix + " DNSRecord [" + postResponse.getId() + "] was removed");
275290
}
276291
}
292+
277293
delete.disconnect();
278294
} catch (Exception ex)
279295
{

‎cloudnet-core/src/main/java/de/dytanic/cloudnetcore/command/CommandShutdown.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void run(ProxyServer obj)
7979
sender.sendMessage("Group doesn't exist");
8080
return;
8181
}
82-
if (args[0].equalsIgnoreCase("server"))
82+
if (args[0].equalsIgnoreCase("server") || args[0].equalsIgnoreCase("-s"))
8383
{
8484
MinecraftServer proxyServer = CloudNet.getInstance().getServer(args[1]);
8585
if (proxyServer != null)
@@ -99,7 +99,7 @@ public void run(ProxyServer obj)
9999
}
100100
return;
101101
}
102-
if (args[0].equalsIgnoreCase("proxy"))
102+
if (args[0].equalsIgnoreCase("proxy") || args[0].equalsIgnoreCase("-p"))
103103
{
104104
ProxyServer proxyServer = CloudNet.getInstance().getProxy(args[1]);
105105
if (proxyServer != null)

‎cloudnet-core/src/main/resources/modules/modules.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
22
# Copyright (c) Tarek Hosni El Alaoui 2017
33
#
4-
CloudNet-Service-PermissionModule=1.0.0.1
5-
CloudNet-Service-MobModule=1.0.0.1
6-
CloudNet-Service-SignsModule=1.0.0.1
7-
CloudNet-Service-CloudFlareModule=1.0.0.1
8-
CloudNet-Service-NotifyServiceModule=1.0.0.1
4+
CloudNet-Service-PermissionModule=1.0.0.2
5+
CloudNet-Service-MobModule=1.0.0.2
6+
CloudNet-Service-SignsModule=1.0.0.2
7+
CloudNet-Service-CloudFlareModule=1.0.0.2
8+
CloudNet-Service-NotifyServiceModule=1.0.0.2

‎cloudnet-modules/cloudnet-modules-cloudflare/src/main/resources/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Copyright (c) Tarek Hosni El Alaoui 2017
33
#
44
name=CloudNet-Service-CloudFlareModule
5-
version=1.0.0.1
5+
version=1.0.0.2
66
author=Dytanic
77
main=de.dytanic.cloudnetcore.cloudflare.CloudFlareModule

‎cloudnet-modules/cloudnet-modules-mobs/src/main/resources/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Copyright (c) Tarek Hosni El Alaoui 2017
33
#
44
name=CloudNet-Service-MobModule
5-
version=1.0.0.1
5+
version=1.0.0.2
66
author=Dytanic
77
main=de.dytanic.cloudnetcore.mobs.MobModule

‎cloudnet-modules/cloudnet-modules-notifyservice/src/main/resources/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Copyright (c) Tarek Hosni El Alaoui 2017
33
#
44
name=CloudNet-Service-NotifyServiceModule
5-
version=1.0.0.1
5+
version=1.0.0.2
66
author=Dytanic
77
main=de.dytanic.cloudnetcore.notifyservice.NotifyServiceModule

‎cloudnet-modules/cloudnet-modules-permission/src/main/resources/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Copyright (c) Tarek Hosni El Alaoui 2017
33
#
44
name=CloudNet-Service-PermissionModule
5-
version=1.0.0.1
5+
version=1.0.0.2
66
author=Dytanic
77
main=de.dytanic.cloudnetcore.permissions.PermissionModule

‎cloudnet-modules/cloudnet-modules-signs/src/main/resources/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name=CloudNet-Service-SignsModule
2-
version=1.0.0.1
2+
version=1.0.0.2
33
author=Dytanic
44
main=de.dytanic.cloudnetcore.signs.SignsModule

‎cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/server/GameServer.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ public boolean bootstrap() throws Exception
244244

245245
FileUtility.copyFilesInDirectory(new File("local/global"), new File(path));
246246

247-
String motd = "Default Motd";
248-
int maxPlayers = 0;
247+
String motd;
248+
int maxPlayers;
249249

250250
if (!serverGroup.getServerType().equals(ServerGroupType.GLOWSTONE))
251251
{
@@ -544,7 +544,7 @@ private boolean a() throws Exception
544544
.append(CloudNetWrapper.getInstance().getWrapperConfig().getWebPort())
545545
.append("/cloudnet/api/v1/download").toString()
546546
, dir.toString() + "/template.zip", CloudNetWrapper.getInstance().getSimpledUser(), template, serverGroup.getName(), custom);
547-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup());
547+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup() + " " + template.getName());
548548
templateLoader.load();
549549
templateLoader.unZip(dir.toString());
550550
FileUtility.copyFilesInDirectory(new File(dir.toString()), new File(path));
@@ -555,7 +555,7 @@ private boolean a() throws Exception
555555
{
556556
Files.createDirectories(Paths.get(groupTemplates));
557557
TemplateLoader templateLoader = new TemplateLoader(template.getUrl(), groupTemplates + "/template.zip");
558-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup());
558+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup() + " " + template.getName());
559559
templateLoader.load();
560560
templateLoader.unZip(groupTemplates);
561561
}
@@ -575,7 +575,7 @@ private boolean a() throws Exception
575575
.append(CloudNetWrapper.getInstance().getWrapperConfig().getWebPort())
576576
.append("/cloudnet/api/v1/download").substring(0)
577577
, groupTemplates + "/template.zip", CloudNetWrapper.getInstance().getSimpledUser(), template, serverGroup.getName(), custom);
578-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup());
578+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup() + " " + template.getName());
579579
templateLoader.load();
580580
templateLoader.unZip(groupTemplates);
581581
}
@@ -595,7 +595,7 @@ private boolean a() throws Exception
595595
Files.createDirectory(Paths.get(path + "/plugins"));
596596

597597
TemplateLoader templateLoader = new TemplateLoader(serverProcess.getMeta().getUrl(), path + "/template.zip");
598-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getServerId());
598+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getServerId() + " " + serverProcess.getMeta().getUrl());
599599
templateLoader.load();
600600
templateLoader.unZip(path);
601601
} else
@@ -614,7 +614,7 @@ private boolean a() throws Exception
614614
{
615615
Files.createDirectories(Paths.get(groupTemplates));
616616
TemplateLoader templateLoader = new TemplateLoader(template.getUrl(), groupTemplates + "/template.zip");
617-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup());
617+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup() + " " + template.getName());
618618
templateLoader.load();
619619
templateLoader.unZip(groupTemplates);
620620
}
@@ -633,19 +633,16 @@ private boolean a() throws Exception
633633
.append(CloudNetWrapper.getInstance().getWrapperConfig().getWebPort())
634634
.append("/cloudnet/api/v1/download").substring(0)
635635
, groupTemplates + "/template.zip", CloudNetWrapper.getInstance().getSimpledUser(), template, serverGroup.getName(), custom);
636-
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup());
636+
System.out.println("Downloading template for " + this.serverProcess.getMeta().getServiceId().getGroup() + " " + template.getName());
637637
templateLoader.load();
638638
templateLoader.unZip(groupTemplates);
639639
}
640640
FileUtility.copyFilesInDirectory(new File(groupTemplates), new File(path));
641641
} else if (Files.exists(Paths.get("local/templates/" + serverGroup.getName() + NetworkUtils.SLASH_STRING + template.getName())))
642642
{
643-
644643
FileUtility.copyFilesInDirectory(new File("local/templates/" + serverGroup.getName() + NetworkUtils.SLASH_STRING + template.getName()), new File(path));
645644
} else
646-
{
647645
return false;
648-
}
649646
}
650647
return true;
651648
}

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<maven.compiler.target>1.8</maven.compiler.target>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
21-
<service.version>2.1.14.2</service.version>
21+
<service.version>2.1.14.3</service.version>
2222
<service.type>RELEASE</service.type>
2323
<!-- Dependencies -->
2424
<dependency.lombok.version>1.18.4</dependency.lombok.version>

0 commit comments

Comments
 (0)